account info

Author: Xavier-Lam

README.md

@@ -23,6 +23,9 @@ pip install 115cli
 After [authenticating](#authentication) with `115cli auth`, you can use the `115cli` command to interact with your 115 cloud storage. Here are some examples of available commands:
 
 ```bash
+# Account info
+115cli account
+
 # List files
 115cli ls /
 115cli ls /path/to/dir -l

README.zh.md

@@ -23,6 +23,9 @@ pip install 115cli
 常见示例:
 
 ```bash
+# 账户信息
+115cli account
+
 # 目录
 115cli ls /
 115cli ls /path/to/dir -l

cli115/cli.py

@@ -4,6 +4,7 @@
 import sys
 
 from cli115.cmds.base import BaseCommand
+from cli115.cmds.account import AccountCommand
 from cli115.cmds.auth import AuthCommand
 from cli115.cmds.config_cmd import ConfigCommand
 from cli115.cmds.cp import CpCommand
@@ -19,6 +20,7 @@
 from cli115.cmds.upload import UploadCommand
 
 COMMANDS: dict[str, BaseCommand] = {
+    "account": AccountCommand(),
     "auth": AuthCommand(),
     "config": ConfigCommand(),
     "ls": LsCommand(),

cli115/client/__init__.py

@@ -1,4 +1,5 @@
 from cli115.client.base import (
+    AccountClient,
     Client,
     Directory,
     DownloadClient,
@@ -12,6 +13,7 @@
 from cli115.client.factory import create_client
 
 __all__ = [
+    "AccountClient",
     "Client",
     "Directory",
     "DownloadClient",

cli115/client/base.py

@@ -249,9 +249,31 @@ class DownloadInfo:
     cookies: str
 
 
+@dataclass(frozen=True)
+class AccountInfo:
+    """Account information for the authenticated user.
+
+    Attributes:
+        user_name: Display name of the user.
+        user_id: Numeric user ID.
+        vip: Whether the user currently has VIP status.
+        expire: VIP expiry datetime, or ``None`` if not available.
+    """
+
+    user_name: str
+    user_id: int
+    vip: bool
+    expire: datetime | None
+
+
 class Client(ABC):
     """Abstract high-level client interface."""
 
+    @property
+    @abstractmethod
+    def account(self) -> AccountClient:
+        """Access account operations."""
+
     @property
     @abstractmethod
     def file(self) -> FileClient:
@@ -536,3 +558,15 @@ def delete(self, *task_hashes: str) -> None:
         Args:
             task_hashes: info_hash values of tasks to delete.
         """
+
+
+class AccountClient(ABC):
+    """Abstract interface for account operations."""
+
+    @abstractmethod
+    def info(self) -> AccountInfo:
+        """Get account information for the authenticated user.
+
+        Returns:
+            An AccountInfo with user name, user ID, VIP status and expiry.
+        """

cli115/client/default.py

@@ -4,6 +4,7 @@
 
 import os
 import warnings
+from datetime import datetime
 from os import PathLike
 from property import locked_cacheproperty
 from typing import BinaryIO, Callable
@@ -13,6 +14,8 @@
 
 from cli115.auth.base import Auth
 from cli115.client.base import (
+    AccountClient,
+    AccountInfo,
     Client,
     CloudTask,
     DEFAULT_PAGE_SIZE,
@@ -101,14 +104,38 @@ def _is_waf_blocked(exc: HTTPStatusError) -> bool:
         return "aliyun.com" in body_text or "alicdn.com" in body_text
 
 
+class DefaultAccountClient(AccountClient):
+
+    def __init__(self, client: DefaultClient):
+        self._client = client
+
+    def info(self) -> AccountInfo:
+        resp = self._client._api.user_my()
+        check_response(resp)
+        data = resp.get("data", {})
+        expire_ts = data.get("expire")
+        expire = datetime.fromtimestamp(expire_ts) if expire_ts else None
+        return AccountInfo(
+            user_name=data.get("user_name", ""),
+            user_id=int(data.get("user_id", 0)),
+            vip=bool(data.get("vip", 0)),
+            expire=expire,
+        )
+
+
 class DefaultClient(Client):
 
     def __init__(self, auth: Auth):
         self._auth = auth
         self._api = _115Client(auth.get_cookies())
+        self._account = DefaultAccountClient(self)
         self._file = DefaultFileClient(self)
         self._download = DefaultDownloadClient(self)
 
+    @property
+    def account(self) -> AccountClient:
+        return self._account
+
     @property
     def file(self) -> FileClient:
         return self._file

cli115/cmds/account.py

@@ -0,0 +1,33 @@
+"""Account command – shows info for the authenticated account."""
+
+from __future__ import annotations
+
+import argparse
+import sys
+
+from cli115.cmds.base import BaseCommand
+from cli115.cmds.formatter import PairFormatterMixin
+
+
+class AccountCommand(PairFormatterMixin, BaseCommand):
+    """Show account info."""
+
+    def register(self, parser: argparse.ArgumentParser) -> None:
+        super().register(parser)
+
+    def execute(self, args: argparse.Namespace) -> None:
+        client = self._create_client()
+
+        try:
+            info = client.account.info()
+        except Exception as e:
+            print(f"Error: {e}", file=sys.stderr)
+            sys.exit(1)
+
+        pairs = [
+            ("Username", info.user_name),
+            ("User ID", info.user_id),
+            ("VIP", info.vip),
+            ("Expire", info.expire),
+        ]
+        self.output(pairs, args)

tests/test_cli_commands.py

@@ -5,6 +5,7 @@
 
 import configparser
 
+from cli115.cmds.account import AccountCommand
 from cli115.cmds.auth import AuthCommand, _parse_cookie_string
 from cli115.cmds.config_cmd import ConfigCommand
 from cli115.cmds.cp import CpCommand
@@ -26,6 +27,7 @@
 from cli115.cmds.upload import UploadCommand
 from cli115.cli import build_parser, main
 from cli115.client.base import (
+    AccountInfo,
     CloudTask,
     Directory,
     DownloadInfo,
@@ -1092,5 +1094,66 @@ def test_config_command_registered_in_cli(self, mock_load):
         self.assertIn("[general]", mock_out.getvalue())
 
 
+class TestAccountCommand(unittest.TestCase):
+
+    @patch("cli115.cmds.account.BaseCommand._create_client")
+    def test_execute_prints_account_info(self, mock_create):
+        mock_client = MagicMock()
+        mock_client.account.info.return_value = AccountInfo(
+            user_name="testuser",
+            user_id=12345,
+            vip=True,
+            expire=datetime(2025, 1, 1),
+        )
+        mock_create.return_value = mock_client
+
+        cmd = AccountCommand()
+        import argparse
+
+        args = argparse.Namespace(format="plain")
+        with patch("builtins.print") as mock_print:
+            cmd.execute(args)
+        output = mock_print.call_args[0][0]
+        self.assertIn("testuser", output)
+        self.assertIn("12345", output)
+
+    @patch("cli115.cmds.account.BaseCommand._create_client")
+    def test_execute_json_format(self, mock_create):
+        mock_client = MagicMock()
+        mock_client.account.info.return_value = AccountInfo(
+            user_name="jsonuser",
+            user_id=99,
+            vip=False,
+            expire=None,
+        )
+        mock_create.return_value = mock_client
+
+        cmd = AccountCommand()
+        import argparse
+
+        args = argparse.Namespace(format="json")
+        with patch("builtins.print") as mock_print:
+            cmd.execute(args)
+        import json
+
+        output = json.loads(mock_print.call_args[0][0])
+        self.assertEqual(output["Username"], "jsonuser")
+        self.assertEqual(output["User ID"], 99)
+
+    @patch("cli115.cmds.account.BaseCommand._create_client")
+    def test_execute_error_exits(self, mock_create):
+        mock_client = MagicMock()
+        mock_client.account.info.side_effect = RuntimeError("API error")
+        mock_create.return_value = mock_client
+
+        cmd = AccountCommand()
+        import argparse
+
+        args = argparse.Namespace(format="plain")
+        with self.assertRaises(SystemExit) as ctx:
+            cmd.execute(args)
+        self.assertEqual(ctx.exception.code, 1)
+
+
 if __name__ == "__main__":
     unittest.main()

tests/test_client_account.py

@@ -0,0 +1,15 @@
+import unittest
+
+from tests.base import BaseTestCase
+
+
+class TestDefaultAccountClient(BaseTestCase):
+
+    def test_info(self):
+        info = self.client.account.info()
+        self.assertTrue(info.user_id)
+        self.assertTrue(info.user_name)
+
+
+if __name__ == "__main__":
+    unittest.main()