refactor base module to resolve circular import

Author: viperadnan-git

sonicbit/modules/base.py sonicbit/base.pysonicbit/modules/base.py renamed to sonicbit/base.py

@@ -1,4 +1,5 @@
-from .token_file import TokenFileHandler, TokenHandler
+from .token_file_handler import TokenFileHandler
+from .token_handler import TokenHandler
 
 __all__ = [
     "TokenHandler",

sonicbit/handlers/__init__.py

@@ -1,20 +1,10 @@
 import json
 import os
 
+from sonicbit.handlers.token_handler import TokenHandler
 from sonicbit.types.auth_response import AuthResponse
 
 
-class TokenHandler:
-    def __init__(self):
-        pass
-
-    def write(self, email: str, auth: AuthResponse) -> None:
-        print(f"{email}'s token is {auth.token}")
-
-    def read(self, email: str) -> str | None:
-        return input(f"Enter {email}'s token: ")
-
-
 class TokenFileHandler(TokenHandler):
     def __init__(self, path: str = ".sonicbit.cache"):
         self.path = os.path.abspath(path)

sonicbit/handlers/token_file.py sonicbit/handlers/token_file_handler.pysonicbit/handlers/token_file.py renamed to sonicbit/handlers/token_file_handler.py

@@ -0,0 +1,12 @@
+from sonicbit.types.auth_response import AuthResponse
+
+
+class TokenHandler:
+    def __init__(self):
+        pass
+
+    def write(self, email: str, auth: AuthResponse) -> None:
+        print(f"{email}'s token is {auth.token}")
+
+    def read(self, email: str) -> str | None:
+        return input(f"Enter {email}'s token: ")

sonicbit/handlers/token_handler.py

@@ -1,12 +1,10 @@
 from .auth import Auth
-from .base import SonicBitBase
 from .file import File
 from .remote_download import RemoteDownload
 from .torrent import Torrent
 from .user import User
 
 __all__ = [
-    "SonicBitBase",
     "Auth",
     "File",
     "RemoteDownload",

sonicbit/modules/__init__.py

@@ -2,9 +2,9 @@
 
 from requests import Session, request
 
+from sonicbit.base import SonicBitBase
 from sonicbit.constants import Constants
-from sonicbit.handlers.token_file import TokenHandler
-from sonicbit.modules.base import SonicBitBase
+from sonicbit.handlers.token_handler import TokenHandler
 from sonicbit.types import AuthResponse
 
 logger = logging.getLogger(__name__)

sonicbit/modules/auth.py

@@ -1,9 +1,8 @@
 import json
 import logging
 
-
+from sonicbit.base import SonicBitBase
 from sonicbit.enums import FileCommand
-from sonicbit.modules.base import SonicBitBase
 from sonicbit.types import File as FileType
 from sonicbit.types import FileList, PathInfo
 

sonicbit/modules/file.py

@@ -1,9 +1,8 @@
 import logging
 
-
+from sonicbit.base import SonicBitBase
 from sonicbit.enums import RemoteDownloadCommand
 from sonicbit.error.error import SonicbitError
-from sonicbit.modules.base import SonicBitBase
 from sonicbit.types import RemoteTaskList
 from sonicbit.types.path_info import PathInfo
 

sonicbit/modules/remote_download.py

@@ -1,10 +1,9 @@
 import logging
 from typing import List
 
-
+from sonicbit.base import SonicBitBase
 from sonicbit.enums import TorrentCommand
 from sonicbit.error import SonicbitError
-from sonicbit.modules.base import SonicBitBase
 from sonicbit.types import PathInfo, TorrentDetails, TorrentList
 
 logger = logging.getLogger(__name__)

sonicbit/modules/torrent.py

@@ -1,8 +1,7 @@
 import logging
 
-
+from sonicbit.base import SonicBitBase
 from sonicbit.error.error import SonicbitError
-from sonicbit.modules.base import SonicBitBase
 from sonicbit.types import UserDetails
 from sonicbit.types.storage_details import StorageDetails