ASMRManager 2.3.2__tar.gz → 2.4.0__tar.gz

{asmrmanager-2.3.2 → asmrmanager-2.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ASMRManager
-Version: 2.3.2
+Version: 2.4.0
 Summary: download, manage and play the voices on asmr.one
 Keywords: asmr,downloader,music,player,manager,cli,tui,commandline,terminal
 Author-Email: SLQY <sqiyel@gmail.com>

asmrmanager-2.4.0/asmrmanager/_version.py

@@ -0,0 +1 @@
+__version__ = "2.4.0"

{asmrmanager-2.3.2 → asmrmanager-2.4.0}/asmrmanager/cli/dl.py

@@ -243,7 +243,27 @@ def search(
     db.commit()
 
 
+@click.command()
+@download_param_options
+def rec(download_params: DownloadParams):
+    """download recommendations of the current account"""
+    spider, db = create_downloader_and_database(download_params)
+    spider.run(spider.get_recommendations())
+    db.commit()
+
+
+@click.command()
+@download_param_options
+def popular(download_params: DownloadParams):
+    """download current popular ASMRs"""
+    spider, db = create_downloader_and_database(download_params)
+    spider.run(spider.get_popular())
+    db.commit()
+
+
 dl.add_command(get)
 dl.add_command(check)
 dl.add_command(search)
 dl.add_command(update)
+dl.add_command(rec)
+dl.add_command(popular)

{asmrmanager-2.3.2 → asmrmanager-2.4.0}/asmrmanager/spider/asmrapi.py

@@ -45,6 +45,7 @@ class ASMRAPI:
         self.password = password
         self.proxy = proxy
         self.limit = limit
+        self.recommender_uuid: str = ""
 
     async def login(self) -> None:
         try:
@@ -54,12 +55,14 @@ class ASMRAPI:
                 headers=self.headers,
                 proxy=self.proxy,
             ) as resp:
-                token = (await resp.json())["token"]
+                resp = await resp.json()
+                token = resp["token"]
                 self.headers.update(
                     {
                         "Authorization": f"Bearer {token}",
                     }
                 )
+                self.recommender_uuid = resp["user"]["recommenderUuid"]
         except ClientConnectorError as err:
             logger.error(f"Login failed, {err}")
 
@@ -143,6 +146,31 @@ class ASMRAPI:
     async def _delete_playlist(self, pl_id: str):
         return await self.post("playlist/delete-playlist", data={"id": pl_id})
 
+    async def get_recommendations(self, page: int = 1):
+        return await self.post(
+            "recommender/recommend-for-user",
+            data={
+                "keyword": " ",
+                "recommenderUuid": self.recommender_uuid,
+                "page": page,
+                "subtitle": 0,
+                "localSubtitledWorks": [],
+                "withPlaylistStatus": [],
+            },
+        )
+
+    async def get_popular(self, page: int = 1):
+        return await self.post(
+            "recommender/popular",
+            data={
+                "keyword": " ",
+                "page": page,
+                "subtitle": 0,
+                "localSubtitledWorks": [],
+                "withPlaylistStatus": [],
+            },
+        )
+
     async def get_search_result(
         self, content: str, params: dict
     ) -> Dict[str, Any]:

{asmrmanager-2.3.2 → asmrmanager-2.4.0}/asmrmanager/spider/downloader.py

@@ -131,13 +131,11 @@ class ASMRDownloadAPI(ASMRAPI):
         self.create_info_file(voice_info, voice_path=voice_path)
 
         tracks = await self.get_voice_tracks(voice_id)
-        if isinstance(tracks, dict):
-            if error_info := tracks.get("error"):
-                logger.error(f"RJ{voice_id} not found, {error_info}")
-                return
-            else:
-                logger.error("Unexpected track type: dict")
-                return
+        if tracks is None:
+            logger.error(
+                f"Remote id {voice_id} error: failed to get tracks, skip download"
+            )
+            return
 
         file_list = self.get_file_list(
             tracks,
@@ -187,7 +185,25 @@ class ASMRDownloadAPI(ASMRAPI):
         return voice_info
 
     async def get_voice_tracks(self, voice_id: RemoteSourceID):
-        return await self.get(f"tracks/{voice_id}")
+        tracks: list[dict] | dict = await self.get(
+            f"tracks/{voice_id}", params={"v": 1}
+        )
+        if isinstance(tracks, dict):
+            if error_info := tracks.get("error"):
+                logger.error(f"Remote id {voice_id} error, {error_info}")
+                if error_info.strip() == "No tracks found":
+                    asmr_web_url = self.base_api_url.replace(
+                        "/api/", ""
+                    ).replace("api.", "")
+                    logger.error(
+                        "I seems to be a problem with the server that has missing files.\n"
+                        f"Try giving feedback there: {asmr_web_url}/work/{voice_id}"
+                    )
+                return None
+            else:
+                logger.error("Unexpected track type: dict")
+                return None
+        return tracks
 
     @staticmethod
     async def download_by_idm(

{asmrmanager-2.3.2 → asmrmanager-2.4.0}/asmrmanager/spider/interface.py

@@ -230,13 +230,9 @@ class ASMRDownloadManager(AsyncManager):
             self.downloader.create_info_file(voice_info, voice_path)
 
             tracks = await self.downloader.get_voice_tracks(source_id_)
-            if isinstance(tracks, dict):
-                if error_info := tracks.get("error"):
-                    logger.error(f"RJ{source_id_} not found, {error_info}")
-                    return
-                else:
-                    logger.error("Unexpected track type: dict")
-                    return
+            if tracks is None:
+                logger.error(f"Failed to get tracks for {source_id_}.")
+                return
 
             file_list = self.downloader.get_file_list(tracks, voice_path)
             self.downloader.create_recover_file(file_list, voice_path)
@@ -247,6 +243,16 @@ class ASMRDownloadManager(AsyncManager):
 
         await asyncio.gather(*tasks)
 
+    async def get_recommendations(self, page: int = 1):
+        res = await self.downloader.get_recommendations(page)
+        ids = [work["id"] for work in res["works"]]
+        await self.get(ids)
+
+    async def get_popular(self, page: int = 1):
+        res = await self.downloader.get_popular(page)
+        ids = [work["id"] for work in res["works"]]
+        await self.get(ids)
+
 
 class ASMRPlayListManager(AsyncManager):
     def __init__(

{asmrmanager-2.3.2 → asmrmanager-2.4.0}/pyproject.toml

@@ -33,7 +33,7 @@ dependencies = [
 ]
 requires-python = ">=3.10"
 readme = "README.md"
-version = "2.3.2"
+version = "2.4.0"
 
 [project.license]
 text = "MIT"

asmrmanager-2.3.2/asmrmanager/_version.py

@@ -1 +0,0 @@
-__version__ = "2.3.2"