Update low-level API.

Author: deadblue

py115/compat/__init__.py

@@ -0,0 +1,13 @@
+__author__ = 'deadblue'
+
+try:
+    from enum import StrEnum
+except ImportError:
+    # Before Python 3.11
+    from enum import Enum
+    class StrEnum(str, Enum): pass
+
+
+__all__ = [
+    'StrEnum'
+]

py115/lowlevel/__init__.py

@@ -1,7 +1,6 @@
 __author__ = 'deadblue'
 
-from .protocol import Client
-from .types import ApiSpec, CommonParams
+from .protocol import ApiSpec, Client, CommonParams
 
 __all__ = [
     'Client', 

py115/lowlevel/api/__init__.py

@@ -1,18 +1,22 @@
 __author__ = 'deadblue'
 
-from .app import AppVersionApi
+from .app import (
+    AppName,
+    AppVersionApi
+)
 from .file import (
-    FileObject, 
-    FileListResult, 
+    FileObject,
+    FileListResult,
     FileListApi,
+    FileSearchApi,
+    FileGetResult,
+    FileGetApi,
     FileDeleteApi,
-    FileMoveApi, 
+    FileMoveApi,
     FileRenameApi,
-
     DirAddApi, 
     DirOrder, 
     DirSortApi,
-
     SpaceInfoResult,
     SpaceInfoApi,
 )
@@ -29,6 +33,7 @@
     VideoPlayDesktopApi
 )
 from .offline import (
+    TaskObject, 
     OfflineListResult,
     OfflineListApi,
     OfflineDeleteApi,
@@ -64,6 +69,9 @@
 from .exceptions import ApiException
 
 __all__ = [
+    'ApiException',
+
+    'AppName',
     'AppVersionApi',
 
     'DirAddApi',
@@ -76,13 +84,18 @@
     'FileObject',
     'FileListResult',
     'FileListApi',
+    'FileGetResult',
+    'FileGetApi',
+    'FileSearchApi',
     'FileDeleteApi',
     'FileMoveApi',
     'FileRenameApi',
 
     'ImageLinkResult',
     'ImageLinkApi',
 
+    'TaskObject',
+
     'OfflineListResult',
     'OfflineListApi',
     'OfflineDeleteApi',
@@ -119,6 +132,4 @@
 
     'UserInfoResult',
     'UserInfoApi',
-
-    'ApiException'
 ]

py115/lowlevel/api/_base.py

@@ -6,7 +6,7 @@
 from urllib.parse import urlencode
 
 from .._crypto import m115
-from ..types import ApiSpec, R
+from ..protocol import ApiSpec, R
 from .exceptions import ApiException
 
 

py115/lowlevel/api/app.py

@@ -2,13 +2,25 @@
 
 from typing import Any, Dict
 
+from py115._internal.api import app
+from py115.compat import StrEnum
 from ._base import JsonApiSpec
 
 
+class AppName(StrEnum):
+
+    WINDOWS = 'window_115'
+    MAC = 'mac_115'
+    LINUX = 'linux_115'
+
+
 class AppVersionApi(JsonApiSpec[str]):
 
-    def __init__(self) -> None:
+    _app_name: str
+
+    def __init__(self, app_name: AppName = AppName.LINUX) -> None:
         super().__init__('https://appversion.115.com/1/web/1.0/api/chrome')
+        self._app_name = app_name.value
 
     def _parse_json_result(self, obj: Dict[str, Any]) -> str:
-        return obj['data']['linux_115']['version_code']
+        return obj['data'][self._app_name]['version_code']

py115/lowlevel/api/file.py

@@ -1,52 +1,62 @@
 __author__ = 'deadblue'
 
 from dataclasses import dataclass
+from enum import IntEnum
 from typing import Dict, List, Optional, Sequence
 
-from ..protocol import RetryException
+from py115.compat import StrEnum
+from py115.lowlevel.protocol import RetryException
 from ._base import JsonApiSpec, JsonResult, VoidApiSpec
 from ._util import to_timestamp
 
 
-try:
-    from enum import StrEnum
-    
-    class DirOrder(StrEnum):
-        FILE_NAME = 'file_name'
-        FILE_SIZE = 'file_size'
-        FILE_TYPE = 'file_type'
-        CREATE_TIME = 'user_ptime'
-        UPDATE_TIME = 'user_utime'
-        OPEN_TIME = 'user_otime'
-        
-except:
-    from enum import Enum
-
-    class DirOrder(str, Enum):
-        FILE_NAME = 'file_name'
-        FILE_SIZE = 'file_size'
-        FILE_TYPE = 'file_type'
-        UPDATE_TIME = 'user_utime'
-        CREATE_TIME = 'user_ptime'
-        OPEN_TIME = 'user_otime'
-
-
 @dataclass(init=False)
 class FileObject:
+    """
+    FileObject represents a file/directory item in cloud storage.
+    """
+
     file_id: str
+    """Unique ID of the file/directory."""
+
     parent_id: str
+    """File ID of parent directory."""
+
     name: str
+    """Base name."""
+
     pickcode: str
+    """Pick code for download/play."""
+
     is_dir: bool
+    """Indicate whether file is a directory."""
+
     is_hidden: bool
+    """Indicate whether file is hidden."""
+
     size: int = 0
+    """File size in bytes."""
+
     sha1: Optional[str] = None
+    """File SHA-1 hash in HEX-format."""
+
     update_time: int
+    """Timestamp when file is updated."""
+
     create_time: Optional[int] = None
+    """Timestamp when file is created."""
+
     open_time: Optional[int] = None
+    """Timestamp when file is opened."""
+
     is_video: bool = False
+    """Indicate whether file is video."""
+
     media_duration: Optional[int] = None
+    """Media duration in seconds for audio/video file."""
+
     video_definition: Optional[int] = None
+    """Video definition for video file."""
 
     def __new__(cls, json_obj: JsonResult):
         ret = object.__new__(cls)
@@ -78,6 +88,7 @@ def __new__(cls, json_obj: JsonResult):
 
 @dataclass
 class FileListResult:
+
     files: List[FileObject]
     order_mode: str
     order_asc: int
@@ -88,12 +99,8 @@ class FileListResult:
 
 class FileListApi(JsonApiSpec[FileListResult]):
 
-    _offset: int
-    _limit: int
-
     def __init__(self, dir_id: str, offset: int = 0, limit: int = 115) -> None:
         super().__init__('')
-        self._offset, self._limit = offset, limit
         self.query.update({
             'aid': '1',
             'cid': dir_id,
@@ -137,9 +144,72 @@ def _parse_json_result(self, obj: JsonResult) -> FileListResult:
             ret.files.append(FileObject(file_obj))
         return ret
 
-    def page_down(self):
-        self._offset += self._limit
-        self.query['offset'] = str(self._offset)
+    def set_offset(self, value: int):
+        self.query['offset'] = str(value)
+
+
+
+class FileSearchApi(JsonApiSpec[FileListResult]):
+
+    def __init__(
+            self, 
+            keyword: str, 
+            dir_id: str = '0', 
+            offset: int = 0, 
+            limit: int = 115
+        ) -> None:
+        super().__init__('https://webapi.115.com/files/search')
+        self.query.update({
+            'aid': '1',
+            'cid': dir_id,
+            'search_value': keyword,
+            'offset': str(offset),
+            'limit': str(limit),
+            'format': 'json'
+        })
+    
+    def _parse_json_result(self, json_obj: JsonResult) -> FileListResult:
+        ret = FileListResult(
+            files=[],
+            order_mode=json_obj.get('order'),
+            order_asc=json_obj.get('is_ac'),
+            offset=json_obj.get('offset'),
+            limit=json_obj.get('page_size'),
+            count=json_obj.get('count')
+        )
+        for file_obj in json_obj['data']:
+            ret.files.append(FileObject(file_obj))
+        return ret
+
+    def set_offset(self, value: int):
+        self.query['offset'] = str(value)
+
+
+@dataclass
+class PathNode:
+
+    file_id: str
+    name: str
+
+
+@dataclass
+class FileGetResult:
+
+    name: str
+    pickcode: str
+    is_dir: bool
+    path: List[PathNode]
+
+
+class FileGetApi(JsonApiSpec[FileGetResult]):
+
+    def __init__(self, file_id: str) -> None:
+        super().__init__('https://webapi.115.com/category/get')
+        self.query['cid'] = file_id
+    
+    def _parse_json_result(self, json_obj: JsonResult) -> FileGetResult:
+        return super()._parse_json_result(json_obj)
+    
 
 
 class FileDeleteApi(VoidApiSpec):
@@ -187,6 +257,30 @@ def _parse_json_result(self, json_obj: JsonResult) -> str:
         return json_obj.get('file_id')
 
 
+class DirOrder(StrEnum):
+    """
+    Mode to sort files in directory.
+    """
+
+    FILE_NAME = 'file_name'
+    """Sort files by name."""
+
+    FILE_SIZE = 'file_size'
+    """Sort files by size."""
+
+    FILE_TYPE = 'file_type'
+    """Sort files by type."""
+
+    CREATE_TIME = 'user_ptime'
+    """Sort files by created time."""
+
+    UPDATE_TIME = 'user_utime'
+    """Sort files by last updated name."""
+
+    OPEN_TIME = 'user_otime'
+    """Sort files by last opened time."""
+
+
 class DirSortApi(VoidApiSpec):
 
     def __init__(self, dir_id: str, order: DirOrder, is_asc: bool) -> None:
@@ -203,6 +297,7 @@ def __init__(self, dir_id: str, order: DirOrder, is_asc: bool) -> None:
 
 @dataclass
 class SpaceInfoResult:
+
     total_size: float
     remain_size: float
     used_size: float

py115/lowlevel/api/media.py

@@ -4,13 +4,14 @@
 from dataclasses import dataclass
 from typing import List
 
-from ..types import CommonParams
+from ..protocol import CommonParams
 from ._base import JsonApiSpec, JsonResult, M115ApiSpec
 from ._util import to_int, to_https_url
 
 
 @dataclass
 class ImageLinkResult:
+
     file_name: str
     origin_url: str
 
@@ -35,13 +36,15 @@ def _parse_json_result(self, json_obj: JsonResult) -> ImageLinkResult:
 
 @dataclass
 class VideoObject:
+
     width: int
     height: int
     play_url: str
 
 
 @dataclass
 class VideoPlayResult:
+
     file_name: str
     duration: int
     items: List[VideoObject]