✨ add logging names

setup.py

@@ -2,7 +2,7 @@
 
 setup(
     name="tiddl",
-    version="1.0.0",
+    version="1.1.0",
     description="TIDDL (Tidal Downloader) is a Python CLI application that allows downloading Tidal tracks.",
     long_description=open('README.md').read(),
     long_description_content_type='text/markdown',

tiddl/__init__.py

@@ -12,32 +12,37 @@
 def main():
     args = parser.parse_args()
 
+    logger = logging.getLogger("TIDDL")
+    stream_handler = logging.StreamHandler()
+    function_log = ""
+
     if args.silent:
         log_level = logging.ERROR
     elif args.verbose:
         log_level = logging.DEBUG
+        function_log = " %(funcName)s"
     else:
         log_level = logging.INFO
 
-    stream_handler = logging.StreamHandler()
     stream_handler.setLevel(log_level)
-    stream_handler.setFormatter(
-        logging.Formatter(
-            "\033[1;34m%(levelname)s\033[0m \033[1;95m%(module)s\033[0m %(message)s"
-        )
-    )
 
     if args.no_color:
         stream_handler.setFormatter(
-            logging.Formatter("[ %(levelname)s %(module)s ] %(message)s")
+            logging.Formatter(
+                f"[ %(levelname)s ] (%(name)s){function_log} - %(message)s"
+            )
+        )
+    else:
+        stream_handler.setFormatter(
+            logging.Formatter(
+                f"\033[1;34m%(levelname)s\033[0m \033[1;95m%(name)s{function_log}\033[0m %(message)s"
+            )
         )
 
     file_handler = logging.FileHandler("tiddl.log", "w", "utf-8")
     file_handler.setLevel(logging.DEBUG)
     file_handler.setFormatter(
-        logging.Formatter(
-            "%(levelname)s\t%(name)s.%(module)s.%(funcName)s :: %(message)s"
-        )
+        logging.Formatter("%(levelname)s\t%(name)s.%(funcName)s :: %(message)s")
     )
 
     logging.basicConfig(
@@ -64,7 +69,7 @@ def main():
             }
         ).get("settings")
 
-        logging.info(f"saved settings to {config.config_path}")
+        logger.info(f"saved settings to {config.config_path}")
 
         # TODO: pretty print settings ✨
         if settings:
@@ -90,7 +95,7 @@ def main():
                 },
             }
         )
-        logging.info(f"authenticated!")
+        logger.info(f"authenticated!")
 
     t_now = int(time.time())
     token_expired = t_now > config["token_expires_at"]
@@ -103,20 +108,20 @@ def main():
                 "token_expires_at": int(time.time()) + token["expires_in"],
             }
         )
-        logging.info(f"refreshed token!")
+        logger.info(f"refreshed token!")
 
     time_to_expire = config["token_expires_at"] - t_now
     days, hours = time_to_expire // (24 * 3600), time_to_expire % (24 * 3600) // 3600
     days_text = f" {days} {'day' if days == 1 else 'days'}" if days else ""
     hours_text = f" {hours} {'hour' if hours == 1 else 'hours'}" if hours else ""
-    logging.info(f"token expires in{days_text}{hours_text}")
+    logger.info(f"token expires in{days_text}{hours_text}")
 
     # TODO: parse input type ✨
     # it can be track, album, playlist or artist
     track_id: str = args.input
 
     if not track_id:
-        logging.warning("no ID nor URL provided")
+        logger.warning("no ID nor URL provided")
         return
 
     api = TidalApi(
@@ -135,7 +140,7 @@ def main():
     else:
         details = quality["details"]
 
-    logging.info(f"{quality['name']} Quality - {details}")
+    logger.info(f"{quality['name']} Quality - {details}")
 
     file_name: str = args.file_name or track_id
     track_path = downloadTrack(
@@ -145,7 +150,7 @@ def main():
         track["manifestMimeType"],
     )
 
-    logging.info(f"track saved in {track_path}")
+    logger.info(f"track saved in {track_path}")
 
 
 if __name__ == "__main__":

tiddl/api.py

@@ -13,23 +13,24 @@ def __init__(self, token: str, user_id: str, country_code: str) -> None:
         self.user_id = user_id
         self.country_code = country_code
 
-        self.session = Session()
-        self.session.headers = {"authorization": f"Bearer {token}"}
+        self._session = Session()
+        self._session.headers = {"authorization": f"Bearer {token}"}
+        self._logger = logging.getLogger("TidalApi")
 
     def getSession(self) -> SessionResponse:
-        return self.session.get(
+        return self._session.get(
             f"{API_URL}/sessions",
         ).json()
 
     def getPlaylists(self) -> PlaylistResponse:
-        return self.session.get(
+        return self._session.get(
             f"{API_URL}/users/{self.user_id}/playlists",
             params={"countryCode": self.country_code},
         ).json()
 
     def getTrack(self, id: int, quality: TrackQuality) -> TrackResponse:
-        logging.debug((id, quality))
-        return self.session.get(
+        self._logger.debug((id, quality))
+        return self._session.get(
             f"{API_URL}/tracks/{id}/playbackinfo",
             params={
                 "audioquality": quality,

tiddl/config.py

@@ -36,20 +36,21 @@ class Config:
     def __init__(self, config_path=DEFAULT_PATH) -> None:
         self.config_path = config_path
         self._config: ConfigData = DEFAULT_CONFIG
+        self._logger = logging.getLogger("Config")
 
         try:
             with open(self.config_path, "r") as f:
-                logging.debug("loading from config file")
+                self._logger.debug("loading from file")
                 loaded_config = json.load(f)
                 self.update(loaded_config)
         except FileNotFoundError:
-            logging.debug("creating new config file")
+            self._logger.debug("creating new file")
             self._save()  # save default config if file does not exist
 
     def _save(self) -> None:
         with open(self.config_path, "w") as f:
             json.dump(self._config, f, indent=2)
-            logging.debug("saved config")
+            self._logger.debug("saved")
 
     def __getitem__(self, key: str) -> Any:
         return self._config[key]
@@ -62,6 +63,6 @@ def __str__(self) -> str:
 
     def update(self, data: ConfigData) -> ConfigData:
         self._config.update(data)
-        logging.debug("updated config")
+        self._logger.debug("updated")
         self._save()
         return self._config.copy()

tiddl/download.py

@@ -10,6 +10,9 @@
 from .types import ManifestMimeType
 
 
+logger = logging.getLogger("download")
+
+
 def decodeManifest(manifest: str):
     return b64decode(manifest).decode()
 
@@ -82,7 +85,7 @@ def threadDownload(urls: list[str]) -> bytes:
 def downloadTrack(
     path: str, file_name: str, encoded_manifest: str, mime_type: ManifestMimeType
 ):
-    logging.debug(mime_type)
+    logger.debug(mime_type)
     manifest = decodeManifest(encoded_manifest)
 
     match mime_type:
@@ -96,7 +99,7 @@ def downloadTrack(
 
     track_data = threadDownload(track_urls)
 
-    logging.debug(codecs)
+    logger.debug(codecs)
 
     """
     known codecs