From c8440f4158805fed1c49d1f06cd71f324eac26a2 Mon Sep 17 00:00:00 2001
From: Koren Lev <korenlev@gmail.com>
Date: Mon, 18 Dec 2017 19:16:16 +0200
Subject: release 1.2 + new tagging

Change-Id: I1e876451ec4a330f458dd57adadb15e39969b225
Signed-off-by: Koren Lev <korenlev@gmail.com>
(cherry picked from commit 98c3ac7c859e34fe60d061b9ca591aba429e4118)
---
 app/discover/scan_metadata_parser.py | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

(limited to 'app/discover/scan_metadata_parser.py')

diff --git a/app/discover/scan_metadata_parser.py b/app/discover/scan_metadata_parser.py
index df27e18..8757f79 100644
--- a/app/discover/scan_metadata_parser.py
+++ b/app/discover/scan_metadata_parser.py
@@ -49,21 +49,28 @@ class ScanMetadataParser(MetadataParser):
             self.add_error('missing or empty fetcher in scanner {} type #{}'
                            .format(scanner_name, str(type_index)))
         elif isinstance(fetcher, str):
+            error_str = None
             try:
-                module_name = ClassResolver.get_module_file_by_class_name(fetcher)
+                get_module = ClassResolver.get_module_file_by_class_name
+                module_name = get_module(fetcher)
                 fetcher_package = module_name.split("_")[0]
                 if package:
                     fetcher_package = ".".join((package, fetcher_package))
-                instance = ClassResolver.get_instance_of_class(package_name=fetcher_package,
-                                                               module_name=module_name,
-                                                               class_name=fetcher)
-            except ValueError:
-                instance = None
-            if not instance:
+                # get the fetcher qualified class but not a class instance
+                # instances will be created just-in-time (before fetching):
+                # this avoids init of access classes not needed in some envs
+                get_class = ClassResolver.get_fully_qualified_class
+                class_qualified = get_class(fetcher, fetcher_package,
+                                            module_name)
+            except ValueError as e:
+                class_qualified = None
+                error_str = str(e)
+            if not class_qualified:
                 self.add_error('failed to find fetcher class {} in scanner {}'
-                               ' type #{}'
-                               .format(fetcher, scanner_name, type_index))
-            scan_type[self.FETCHER] = instance
+                               ' type #{} ({})'
+                               .format(fetcher, scanner_name, type_index,
+                                       error_str))
+            scan_type[self.FETCHER] = class_qualified
         elif isinstance(fetcher, dict):
             is_folder = fetcher.get('folder', False)
             if not is_folder:
@@ -81,7 +88,6 @@ class ScanMetadataParser(MetadataParser):
 
     def validate_children_scanner(self, scanner_name: str, type_index: int,
                                   scanners: dict, scan_type: dict):
-        scanner = scanners[scanner_name]
         if 'children_scanner' in scan_type:
             children_scanner = scan_type.get('children_scanner')
             if not isinstance(children_scanner, str):
-- 
cgit 1.2.3-korg