Merge pull request #86 from ParkenDD/allow-converter-intermediate-cla…

…sses Allow converter intermediate classes
ParkenDD · Jan 31, 2024 · ab76cbf · ab76cbf
2 parents f306f9d + 4642ce3
commit ab76cbf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/webapp/converter b/webapp/converter
diff --git a/webapp/services/import_service/generic/parking_site_generic_import_service.py b/webapp/services/import_service/generic/parking_site_generic_import_service.py
@@ -75,8 +75,8 @@ def register_converters(self):
         # appending the base package dir gives converters the ability to work within their own module without relative paths
         sys.path.append(str(base_package_dir))
         # This import is based on the additional module path just added to sys
-        from common.base_converter import CsvConverter, JsonConverter, PullConverter, XlsxConverter, XmlConverter
-        from util import ScraperBase
+        from common.base_converter import PullConverter
+        from util import ScraperBase, SourceInfo
 
         for source_dir in ['original', 'new', 'v3']:
             package_dir = base_package_dir.joinpath(source_dir)
@@ -95,16 +95,10 @@ def register_converters(self):
                         self.legacy_pull_converters[attribute.POOL.id] = attribute()
                         continue
 
-                    if (
-                        not issubclass(attribute, XlsxConverter)
-                        and not issubclass(attribute, XmlConverter)
-                        and not issubclass(attribute, CsvConverter)
-                        and not issubclass(attribute, JsonConverter)
-                        and not issubclass(attribute, PullConverter)
-                    ):
-                        continue
-                    if attribute in [XlsxConverter, XmlConverter, CsvConverter, JsonConverter, PullConverter]:
+                    # source_info is just set at actual final classes, so we ignore anything else
+                    if not hasattr(attribute, 'source_info') or not isinstance(attribute.source_info, SourceInfo):
                         continue
+
                     # at this point we can be sure that attribute is a BaseConverter or PullConverter child, so we can initialize and
                     # register it
                     if issubclass(attribute, PullConverter):
+1 −0		common/base_converter/__init__.py
+112 −0		common/base_converter/normalized_xlsx_converter.py
+5 −1		test-push-converter.py
+2 −88		v3/vrs_p_r.py