music_kraken/download/__init__.py

@@ -94,8 +94,6 @@ class Downloader:
 
     def scan_for_pages(self, **kwargs):
         # assuming the wanted pages are the leaf classes of the interface
-        from .. import pages
-        
         leaf_classes = []
 
         class_list = [Page]
@@ -109,9 +107,6 @@ class Downloader:
             else:
                 class_list.extend(class_subclasses)
 
-        if Page in leaf_classes:
-            self.LOGGER.warn("couldn't find any data source")
-            return
         for leaf_class in leaf_classes:
             self.register_page(leaf_class, **kwargs)
 
@@ -347,17 +342,15 @@ class Page:
         cls.LOGGER = logging.getLogger(cls.__name__)
         return super().__new__(cls)
 
-    @classmethod
-    def is_leaf_page(cls) -> bool:
-        return len(cls.__subclasses__()) == 0
-
     def __init__(self, download_options: DownloadOptions = None, fetch_options: FetchOptions = None, **kwargs):
+        if self.SOURCE_TYPE is not None:
             self.SOURCE_TYPE.register_page(self)
         
         self.download_options: DownloadOptions = download_options or DownloadOptions()
         self.fetch_options: FetchOptions = fetch_options or FetchOptions()
 
     def __del__(self):
+        if self.SOURCE_TYPE is not None:
             self.SOURCE_TYPE.deregister_page()
 
     def _search_regex(self, pattern, string, default=None, fatal=True, flags=0, group=None):

music_kraken/pages/__init__.py

@@ -1,11 +1,4 @@
-import importlib
-import inspect
-import logging
-import pkgutil
-import sys
 from collections import defaultdict
-from copy import copy
-from pathlib import Path
 from typing import Dict, Generator, List, Set, Type
 
 from ._bandcamp import Bandcamp
@@ -14,39 +7,3 @@ from ._genius import Genius
 from ._musify import Musify
 from ._youtube import YouTube
 from ._youtube_music import YoutubeMusic
-
-
-def import_children():
-    _page_directory = Path(__file__).parent
-    _stem_blacklist = set(["__pycache__", "__init__"])
-
-    for _file in _page_directory.iterdir():
-        if _file.stem in _stem_blacklist:
-            continue
-        
-        logging.debug(f"importing {_file.absolute()}")
-        exec(f"from . import {_file.stem}")
-
-# module_blacklist = set(sys.modules.keys())
-import_children()
-
-"""
-classes = set()
-
-print(__name__)
-for module_name, module in sys.modules.items():
-    if module_name in module_blacklist or not module_name.startswith(__name__):
-        continue
-
-    print("scanning module", module_name)
-    for name, obj in inspect.getmembers(module, predicate=inspect.isclass):
-        _module = obj.__module__
-        if _module.startswith(__name__) and hasattr(obj, "SOURCE_TYPE"):
-            print("checking object", name, obj.__module__)
-            classes.add(obj)
-    print()
-
-print(*(c.__name__ for c in classes), sep=",\t")
-
-__all__ = [c.__name__ for c in classes]
-"""