Fix account-manager merge conflicts
Made-with: Cursor
This commit is contained in:
@@ -8,7 +8,6 @@ if sys.platform == "win32":
|
|||||||
import io
|
import io
|
||||||
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
|
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, encoding='utf-8', errors='replace')
|
||||||
sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding='utf-8', errors='replace')
|
sys.stderr = io.TextIOWrapper(sys.stderr.buffer, encoding='utf-8', errors='replace')
|
||||||
|
|
||||||
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
|
||||||
ACCOUNTS_FILE = os.path.join(BASE_DIR, "accounts.json")
|
ACCOUNTS_FILE = os.path.join(BASE_DIR, "accounts.json")
|
||||||
|
|
||||||
@@ -53,7 +52,6 @@ def cmd_list(platform="all"):
|
|||||||
if not found:
|
if not found:
|
||||||
print(f"ERROR:NO_ACCOUNTS_FOUND")
|
print(f"ERROR:NO_ACCOUNTS_FOUND")
|
||||||
|
|
||||||
|
|
||||||
def cmd_get(account_id):
|
def cmd_get(account_id):
|
||||||
accounts = load_accounts()
|
accounts = load_accounts()
|
||||||
for platform_accounts in accounts.values():
|
for platform_accounts in accounts.values():
|
||||||
@@ -106,7 +104,6 @@ async def main():
|
|||||||
print("登录态已保存!")
|
print("登录态已保存!")
|
||||||
asyncio.run(main())
|
asyncio.run(main())
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import tempfile
|
import tempfile
|
||||||
with tempfile.NamedTemporaryFile(mode='w', suffix='.py',
|
with tempfile.NamedTemporaryFile(mode='w', suffix='.py',
|
||||||
delete=False, encoding='utf-8') as f:
|
delete=False, encoding='utf-8') as f:
|
||||||
|
|||||||
Reference in New Issue
Block a user