diff --git a/README.md b/README.md index 07de8e2..e3d214b 100644 --- a/README.md +++ b/README.md @@ -196,6 +196,24 @@ sz-tui # TUI (登录门禁, 中文菜单) 依赖: 源码版 `python3 >= 3.10` + `cryptography >= 50.0.0`（cobblestone 流式加密，postinst 自动装最新版）；编译版无 Python 依赖。两版都需要 `p7zip-full`（7z 压缩）。 +## 一键备份 (手机特色功能) + +相册 / 文档 / 下载 / 聊天记录一键备份到私有加密服务器（增量，只传新文件）： + +```bash +sz-backup # 备份全部 (photos+documents+download+chat) +sz-backup photos # 只备份相册 +sz-backup list # 已备份清单 +sz-backup restore photos # 恢复相册 +``` + +- 增量: mtime+size 对比本地清单, 只传新增/修改文件; 批量 tar 打包 (500MB/批) +- 源目录默认: photos=/sdcard/DCIM+Pictures, documents=/sdcard/Documents, + download=/sdcard/Download; 可在 config.json `backup` 段自定义 +- **聊天记录**: PRoot 无 root 读不到微信数据库 (/data/data), 需先微信"备份与迁移/ + 导出"到手机存储, 再把目录配到 config.json backup.chat +- TUI 菜单 13 一键备份 / 14 恢复备份 + ## Releases 下载 Gitee / Gitea 仓库 Releases 页下载 deb 包（tag v1.0.0）： diff --git a/backup.py b/backup.py new file mode 100644 index 0000000..73a7ffc --- /dev/null +++ b/backup.py @@ -0,0 +1,312 @@ +#!/usr/bin/env python3 +"""一键备份: 相册/聊天记录/文档 -> 私有加密服务器 + +增量备份 (mtime+size 对比本地清单) + 批量 tar + 复用加密上传管线。 +手机 ZeroTermux/PRoot 可用: /sdcard/DCIM 等外部存储直接可见。 + +聊天记录注意: PRoot 无 root 读不到微信数据库 (/data/data), 需先把 +微信"备份与迁移/导出"的文件放到手机存储, 再配置 backup.chat 目录。 + +用法: + sz-backup # 备份全部 (photos+documents+download+chat) + sz-backup photos # 只备份相册 + sz-backup list # 已备份清单 + sz-backup restore photos # 恢复相册 +""" +import argparse +import json +import os +import subprocess +import sys +import tarfile +from datetime import datetime +from pathlib import Path +from typing import Any + +STATE_DIR = Path.home() / ".local/share/7z-encrypt" / "backup" +BATCH_MB = 500 # 每批 tar 上限 +BATCH_FILES = 500 # 每批文件数上限 +# 高压缩率类型 (聊天记录/文档) 用 gzip, 照片/视频直接存 +COMPRESS_SUFFIX = {".db", ".sqlite", ".sqlite3", ".sql", ".txt", ".json", ".xml", ".csv", ".log", ".md", ".html"} + + +def _cfg() -> dict[str, Any]: + """读配置文件 backup 段 (XDG, 同客户端)""" + env = os.environ.get("SZ_CONFIG") + if env: + p = Path(env).expanduser() + else: + xdg = os.environ.get("XDG_CONFIG_HOME") or str(Path.home() / ".config") + p = Path(xdg) / "7z-encrypt" / "config.json" + try: + return dict(json.loads(p.read_text(encoding="utf-8")).get("backup", {})) + except (OSError, json.JSONDecodeError): + return {} + + +def _manifest_path(name: str) -> Path: + return STATE_DIR / f"{name}.json" + + +def _load_manifest(name: str) -> dict[str, Any]: + try: + return json.loads(_manifest_path(name).read_text(encoding="utf-8")) + except (OSError, json.JSONDecodeError): + return {"files": {}, "batches": {}} + + +def _save_manifest(name: str, m: dict[str, Any]) -> None: + _manifest_path(name).parent.mkdir(parents=True, exist_ok=True) + _manifest_path(name).write_text(json.dumps(m, ensure_ascii=False, indent=1), encoding="utf-8") + + +def _server() -> str: + """服务器地址: 配置 server.url (备份复用客户端配置)""" + env = os.environ.get("SZ_CONFIG") + if env: + p = Path(env).expanduser() + else: + xdg = os.environ.get("XDG_CONFIG_HOME") or str(Path.home() / ".config") + p = Path(xdg) / "7z-encrypt" / "config.json" + try: + return str(json.loads(p.read_text(encoding="utf-8")).get("server", {}).get("url", "")) + except (OSError, json.JSONDecodeError): + return "" + + +def _token() -> str: + """登录 token: 配置文件 server.token""" + env = os.environ.get("SZ_CONFIG") + if env: + p = Path(env).expanduser() + else: + xdg = os.environ.get("XDG_CONFIG_HOME") or str(Path.home() / ".config") + p = Path(xdg) / "7z-encrypt" / "config.json" + try: + return str(json.loads(p.read_text(encoding="utf-8")).get("server", {}).get("token", "")) + except (OSError, json.JSONDecodeError): + return "" + + +def _src_dirs(name: str) -> list[Path]: + """备份源目录: 配置 override 默认""" + defaults = { + "photos": ["~/storage/dcim", "~/storage/pictures", "/sdcard/DCIM", "/sdcard/Pictures"], + "documents": ["/sdcard/Documents"], + "download": ["/sdcard/Download"], + "chat": [], + } + dirs = _cfg().get(name, defaults.get(name, [])) + return [Path(d).expanduser() for d in dirs] + + +def _scan_new(name: str, manifest: dict[str, Any]) -> list[Path]: + """扫描新增/修改文件 (mtime+size 对比)""" + known = manifest.get("files", {}) + new_files: list[Path] = [] + for src in _src_dirs(name): + if not src.exists(): + continue + for p in src.rglob("*"): + if not p.is_file(): + continue + try: + st = p.stat() + except OSError: + continue + key = str(p) + if key in known and known[key][0] == st.st_size and known[key][1] == int(st.st_mtime): + continue + new_files.append(p) + return new_files + + +def _compress(path: Path) -> bool: + return path.suffix.lower() in COMPRESS_SUFFIX + + +def _batch(files: list[Path]) -> list[list[Path]]: + """按大小/数量分批""" + batches: list[list[Path]] = [] + cur: list[Path] = [] + total = 0 + for f in files: + size = f.stat().st_size + if cur and (total + size > BATCH_MB * 1024 * 1024 or len(cur) >= BATCH_FILES): + batches.append(cur) + cur, total = [], 0 + cur.append(f) + total += size + if cur: + batches.append(cur) + return batches + + +def _upload_tar(tar_path: Path, chunk_mb: int) -> str: + """加密 -> 分卷 -> 上传 (复用 metadata/splitter/crypto/transfer 库, 编译版自包含)""" + from metadata import build_init_json, sha256_of + from splitter import split_stream + from crypto import CryptoEngine, KeyNotFoundError + import transfer as transfer_mod + + engine = CryptoEngine() + try: + engine.get_key("default_key") + except KeyNotFoundError: + engine.generate_key("default_key") + chunk_size = chunk_mb * 1024 * 1024 + enc_path = tar_path.with_suffix(tar_path.suffix + ".enc") + with open(tar_path, "rb") as src, open(enc_path, "wb") as dst: + enc_params = engine.encrypt_stream(src, dst, "default_key", progress=lambda n: None) + with open(enc_path, "rb") as f: + manifest = split_stream(f, chunk_size, str(enc_path), total_size=enc_path.stat().st_size, + progress=lambda n: None) + total_sha = sha256_of(enc_path) + init_json = build_init_json( + file_name=engine.encrypt_name(tar_path.name), + file_size=tar_path.stat().st_size, + total_sha256=total_sha, + enc=enc_params, + chunks=manifest, + ) + chunk_files = {ch["index"]: Path(ch["filename"]).resolve() for ch in manifest} + client = transfer_mod.TransferClient(_server(), token=_token()) + receipt = client.transfer(init_json, chunk_files) + enc_path.unlink(missing_ok=True) + for ch in manifest: + Path(ch["filename"]).unlink(missing_ok=True) + return str(receipt["file_id"]) + + +def backup(name: str, chunk_mb: int = 10) -> int: + manifest = _load_manifest(name) + files = _scan_new(name, manifest) + if not files: + print(f"[备份] {name}: 无新增文件, 已是最新") + return 0 + batches = _batch(files) + print(f"[备份] {name}: 新增 {len(files)} 个文件 ({sum(f.stat().st_size for f in files) / 1048576:.1f} MB), {len(batches)} 批") + ts = datetime.now().strftime("%Y%m%d_%H%M%S") + for i, batch in enumerate(batches, 1): + tar_path = STATE_DIR / f"{name}_{ts}_{i:02d}.tar" + tar_path.parent.mkdir(parents=True, exist_ok=True) + mode = "w:gz" if any(_compress(f) for f in batch) else "w" + with tarfile.open(tar_path, mode) as tf: + for f in batch: + try: + tf.add(f, arcname=str(f)) + except (OSError, tarfile.TarError) as e: + print(f" [跳过] {f}: {e}") + size_mb = tar_path.stat().st_size / 1048576 + print(f"[备份] 批次 {i}/{len(batches)}: {tar_path.name} ({size_mb:.1f} MB), 上传中 ...") + try: + fid = _upload_tar(tar_path, chunk_mb) + except RuntimeError as e: + print(f"[错误] {e}") + return 1 + files_in_batch = [str(f) for f in batch if tarfile.open(tar_path).getnames()] + for f in batch: + try: + st = f.stat() + manifest.setdefault("files", {})[str(f)] = [st.st_size, int(st.st_mtime)] + except OSError: + pass + manifest.setdefault("batches", {})[tar_path.name] = { + "server_id": fid, "size": tar_path.stat().st_size, "files": files_in_batch, + } + _save_manifest(name, manifest) + print(f"[备份] 批次 {i} 完成: file_id={fid}") + tar_path.unlink(missing_ok=True) + print(f"[备份] {name} 完成, 共 {len(files)} 个文件") + return 0 + + +def _download_batch(file_id: str, out_dir: Path) -> Path: + """下载 + 解密备份批次 (复用 transfer/crypto 库), 返回还原的 tar 路径""" + import transfer as transfer_mod + from crypto import CryptoEngine + + client = transfer_mod.TransferClient(_server(), token=_token()) + enc_path, enc_params = client.download(file_id, out_dir / ".sz-backup.enc") + engine = CryptoEngine() + final = out_dir / str(enc_params.get("file_name", "backup.tar")) + with open(enc_path, "rb") as src, open(final, "wb") as dst: + engine.decrypt_stream(src, dst, enc_params["key_id"], + enc_params.get("context", "7z-encrypt:v1").encode(), + progress=lambda n: None) + enc_path.unlink(missing_ok=True) + return final + + +def restore(name: str, out_root: Path | None = None) -> int: + manifest = _load_manifest(name) + batches = manifest.get("batches", {}) + if not batches: + print(f"[恢复] {name}: 无备份记录") + return 1 + print(f"[恢复] {name}: {len(batches)} 个备份批次") + for tar_name, info in batches.items(): + dl = STATE_DIR / f"restore_{tar_name}" + dl.mkdir(parents=True, exist_ok=True) + try: + tar_src = _download_batch(info["server_id"], dl) + except Exception as e: + print(f"[错误] 下载 {tar_name} 失败: {e}") + return 1 + # 解包 (路径校验: 只解回 manifest 记录的文件) + with tarfile.open(tar_src) as tf: + for member in tf.getmembers(): + if member.name not in info.get("files", []): + continue + if out_root is not None: + rel = member.name.lstrip("/") + tf.extract(member, path=out_root / rel, filter="data") + else: + tf.extract(member, path=Path(member.name).parent, filter="data") + print(f"[恢复] 批次完成: {tar_name}") + print(f"[恢复] {name} 完成") + return 0 + + +def list_backups() -> int: + if not STATE_DIR.exists(): + print("[备份] 暂无备份记录") + return 0 + for mp in sorted(STATE_DIR.glob("*.json")): + name = mp.stem + m = _load_manifest(name) + batches = m.get("batches", {}) + total = sum(b["size"] for b in batches.values()) + print(f" {name}: {len(m.get('files', {}))} 文件, {len(batches)} 批, {total / 1048576:.1f} MB 已备份") + return 0 + + +def main() -> int: + ap = argparse.ArgumentParser(description="一键备份: 相册/聊天记录/文档 -> 加密服务器") + ap.add_argument("action", nargs="?", default="all", help="备份项: photos/documents/download/chat/all/list/restore") + ap.add_argument("target", nargs="?", help="restore 的备份项") + ap.add_argument("--chunk-size", type=int, default=10, help="分卷大小 MB (默认 10)") + args = ap.parse_args() + + if args.action == "list": + return list_backups() + if args.action == "restore": + if not args.target: + print("[错误] 用法: sz-backup restore ") + return 1 + return restore(args.target) + names = ["photos", "documents", "download", "chat"] if args.action == "all" else [args.action] + if args.action not in ("photos", "documents", "download", "chat", "all"): + print(f"[错误] 未知备份项: {args.action} (photos/documents/download/chat/all)") + return 1 + ok = True + for n in names: + if not _src_dirs(n): + print(f"[备份] {n}: 无源目录 (config backup.{n} 为空, 跳过)") + continue + ok = backup(n, args.chunk_size) == 0 and ok + return 0 if ok else 1 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/debian/7z-encrypt-client-bin/DEBIAN/control b/debian/7z-encrypt-client-bin/DEBIAN/control index 07846f7..14ab16b 100644 --- a/debian/7z-encrypt-client-bin/DEBIAN/control +++ b/debian/7z-encrypt-client-bin/DEBIAN/control @@ -3,7 +3,7 @@ Source: 7z-encrypt-client Version: 1.0.0 Architecture: amd64 Maintainer: edgevoid -Installed-Size: 36459 +Installed-Size: 51850 Depends: p7zip-full Conflicts: 7z-encrypt-client Replaces: 7z-encrypt-client diff --git a/debian/7z-encrypt-client-bin/DEBIAN/md5sums b/debian/7z-encrypt-client-bin/DEBIAN/md5sums index 14210d5..e668ad1 100644 --- a/debian/7z-encrypt-client-bin/DEBIAN/md5sums +++ b/debian/7z-encrypt-client-bin/DEBIAN/md5sums @@ -1,3 +1,4 @@ +094c9453f9346a962da07a6e123cc5fc usr/bin/sz-backup 61901c8e9af062eef5c386c715f5f3bb usr/bin/sz-config 02b57eea9c5ca54c63fd82da1d6d960b usr/bin/sz-transfer 8f9902ebfd228e08f7691abe6d471d86 usr/bin/sz-tui diff --git a/debian/7z-encrypt-client/DEBIAN/control b/debian/7z-encrypt-client/DEBIAN/control index 21ec9fd..3865997 100644 --- a/debian/7z-encrypt-client/DEBIAN/control +++ b/debian/7z-encrypt-client/DEBIAN/control @@ -2,7 +2,7 @@ Package: 7z-encrypt-client Version: 1.0.0 Architecture: all Maintainer: edgevoid -Installed-Size: 101 +Installed-Size: 115 Depends: python3 (>= 3.10), python3-venv, p7zip-full Section: utils Priority: optional diff --git a/debian/7z-encrypt-client/DEBIAN/md5sums b/debian/7z-encrypt-client/DEBIAN/md5sums index e8a2e42..53ee85e 100644 --- a/debian/7z-encrypt-client/DEBIAN/md5sums +++ b/debian/7z-encrypt-client/DEBIAN/md5sums @@ -1,12 +1,14 @@ +79d3e0fcf18518cae924a2f1b3bcb5b0 usr/bin/sz-backup 440c53f84f5722b5146959c8fc6d7a23 usr/bin/sz-config ec8cf0df841e479689ccb681f6168ccc usr/bin/sz-transfer 0ba5b8147990daa7fd07344952c42847 usr/bin/sz-tui +6feb7910267c07ebba1728a0c85acfa4 usr/share/7z-encrypt/backup.py dcb31e74e0a6ee8073337fc4fb2acf99 usr/share/7z-encrypt/config.py 8a064c0b3c21d50812a3fd69a320d862 usr/share/7z-encrypt/crypto.py 21062e04f8c7f4471881a39c489dfa73 usr/share/7z-encrypt/metadata.py 3478ac8277b4b1a38694ad0cc8cdbcdb usr/share/7z-encrypt/splitter.py b90b8c950f99e1439bc273f50a2ee0a6 usr/share/7z-encrypt/state.py 342458cd8e61337d5ee659fc24ccac8b usr/share/7z-encrypt/transfer.py -e60f9836c1eb125ac5b2296f9e906c8d usr/share/7z-encrypt/tui.py +12cb430b890a6ef5a532dbb8523b0f54 usr/share/7z-encrypt/tui.py 198943ad7a94f6ba0995cf2d326f66d4 usr/share/doc/7z-encrypt-client/changelog.gz fadf3972cc61c7c76d0ccc20b29a804c usr/share/doc/7z-encrypt-client/copyright diff --git a/debian/7z-encrypt-client/usr/share/7z-encrypt/backup.py b/debian/7z-encrypt-client/usr/share/7z-encrypt/backup.py new file mode 100644 index 0000000..73a7ffc --- /dev/null +++ b/debian/7z-encrypt-client/usr/share/7z-encrypt/backup.py @@ -0,0 +1,312 @@ +#!/usr/bin/env python3 +"""一键备份: 相册/聊天记录/文档 -> 私有加密服务器 + +增量备份 (mtime+size 对比本地清单) + 批量 tar + 复用加密上传管线。 +手机 ZeroTermux/PRoot 可用: /sdcard/DCIM 等外部存储直接可见。 + +聊天记录注意: PRoot 无 root 读不到微信数据库 (/data/data), 需先把 +微信"备份与迁移/导出"的文件放到手机存储, 再配置 backup.chat 目录。 + +用法: + sz-backup # 备份全部 (photos+documents+download+chat) + sz-backup photos # 只备份相册 + sz-backup list # 已备份清单 + sz-backup restore photos # 恢复相册 +""" +import argparse +import json +import os +import subprocess +import sys +import tarfile +from datetime import datetime +from pathlib import Path +from typing import Any + +STATE_DIR = Path.home() / ".local/share/7z-encrypt" / "backup" +BATCH_MB = 500 # 每批 tar 上限 +BATCH_FILES = 500 # 每批文件数上限 +# 高压缩率类型 (聊天记录/文档) 用 gzip, 照片/视频直接存 +COMPRESS_SUFFIX = {".db", ".sqlite", ".sqlite3", ".sql", ".txt", ".json", ".xml", ".csv", ".log", ".md", ".html"} + + +def _cfg() -> dict[str, Any]: + """读配置文件 backup 段 (XDG, 同客户端)""" + env = os.environ.get("SZ_CONFIG") + if env: + p = Path(env).expanduser() + else: + xdg = os.environ.get("XDG_CONFIG_HOME") or str(Path.home() / ".config") + p = Path(xdg) / "7z-encrypt" / "config.json" + try: + return dict(json.loads(p.read_text(encoding="utf-8")).get("backup", {})) + except (OSError, json.JSONDecodeError): + return {} + + +def _manifest_path(name: str) -> Path: + return STATE_DIR / f"{name}.json" + + +def _load_manifest(name: str) -> dict[str, Any]: + try: + return json.loads(_manifest_path(name).read_text(encoding="utf-8")) + except (OSError, json.JSONDecodeError): + return {"files": {}, "batches": {}} + + +def _save_manifest(name: str, m: dict[str, Any]) -> None: + _manifest_path(name).parent.mkdir(parents=True, exist_ok=True) + _manifest_path(name).write_text(json.dumps(m, ensure_ascii=False, indent=1), encoding="utf-8") + + +def _server() -> str: + """服务器地址: 配置 server.url (备份复用客户端配置)""" + env = os.environ.get("SZ_CONFIG") + if env: + p = Path(env).expanduser() + else: + xdg = os.environ.get("XDG_CONFIG_HOME") or str(Path.home() / ".config") + p = Path(xdg) / "7z-encrypt" / "config.json" + try: + return str(json.loads(p.read_text(encoding="utf-8")).get("server", {}).get("url", "")) + except (OSError, json.JSONDecodeError): + return "" + + +def _token() -> str: + """登录 token: 配置文件 server.token""" + env = os.environ.get("SZ_CONFIG") + if env: + p = Path(env).expanduser() + else: + xdg = os.environ.get("XDG_CONFIG_HOME") or str(Path.home() / ".config") + p = Path(xdg) / "7z-encrypt" / "config.json" + try: + return str(json.loads(p.read_text(encoding="utf-8")).get("server", {}).get("token", "")) + except (OSError, json.JSONDecodeError): + return "" + + +def _src_dirs(name: str) -> list[Path]: + """备份源目录: 配置 override 默认""" + defaults = { + "photos": ["~/storage/dcim", "~/storage/pictures", "/sdcard/DCIM", "/sdcard/Pictures"], + "documents": ["/sdcard/Documents"], + "download": ["/sdcard/Download"], + "chat": [], + } + dirs = _cfg().get(name, defaults.get(name, [])) + return [Path(d).expanduser() for d in dirs] + + +def _scan_new(name: str, manifest: dict[str, Any]) -> list[Path]: + """扫描新增/修改文件 (mtime+size 对比)""" + known = manifest.get("files", {}) + new_files: list[Path] = [] + for src in _src_dirs(name): + if not src.exists(): + continue + for p in src.rglob("*"): + if not p.is_file(): + continue + try: + st = p.stat() + except OSError: + continue + key = str(p) + if key in known and known[key][0] == st.st_size and known[key][1] == int(st.st_mtime): + continue + new_files.append(p) + return new_files + + +def _compress(path: Path) -> bool: + return path.suffix.lower() in COMPRESS_SUFFIX + + +def _batch(files: list[Path]) -> list[list[Path]]: + """按大小/数量分批""" + batches: list[list[Path]] = [] + cur: list[Path] = [] + total = 0 + for f in files: + size = f.stat().st_size + if cur and (total + size > BATCH_MB * 1024 * 1024 or len(cur) >= BATCH_FILES): + batches.append(cur) + cur, total = [], 0 + cur.append(f) + total += size + if cur: + batches.append(cur) + return batches + + +def _upload_tar(tar_path: Path, chunk_mb: int) -> str: + """加密 -> 分卷 -> 上传 (复用 metadata/splitter/crypto/transfer 库, 编译版自包含)""" + from metadata import build_init_json, sha256_of + from splitter import split_stream + from crypto import CryptoEngine, KeyNotFoundError + import transfer as transfer_mod + + engine = CryptoEngine() + try: + engine.get_key("default_key") + except KeyNotFoundError: + engine.generate_key("default_key") + chunk_size = chunk_mb * 1024 * 1024 + enc_path = tar_path.with_suffix(tar_path.suffix + ".enc") + with open(tar_path, "rb") as src, open(enc_path, "wb") as dst: + enc_params = engine.encrypt_stream(src, dst, "default_key", progress=lambda n: None) + with open(enc_path, "rb") as f: + manifest = split_stream(f, chunk_size, str(enc_path), total_size=enc_path.stat().st_size, + progress=lambda n: None) + total_sha = sha256_of(enc_path) + init_json = build_init_json( + file_name=engine.encrypt_name(tar_path.name), + file_size=tar_path.stat().st_size, + total_sha256=total_sha, + enc=enc_params, + chunks=manifest, + ) + chunk_files = {ch["index"]: Path(ch["filename"]).resolve() for ch in manifest} + client = transfer_mod.TransferClient(_server(), token=_token()) + receipt = client.transfer(init_json, chunk_files) + enc_path.unlink(missing_ok=True) + for ch in manifest: + Path(ch["filename"]).unlink(missing_ok=True) + return str(receipt["file_id"]) + + +def backup(name: str, chunk_mb: int = 10) -> int: + manifest = _load_manifest(name) + files = _scan_new(name, manifest) + if not files: + print(f"[备份] {name}: 无新增文件, 已是最新") + return 0 + batches = _batch(files) + print(f"[备份] {name}: 新增 {len(files)} 个文件 ({sum(f.stat().st_size for f in files) / 1048576:.1f} MB), {len(batches)} 批") + ts = datetime.now().strftime("%Y%m%d_%H%M%S") + for i, batch in enumerate(batches, 1): + tar_path = STATE_DIR / f"{name}_{ts}_{i:02d}.tar" + tar_path.parent.mkdir(parents=True, exist_ok=True) + mode = "w:gz" if any(_compress(f) for f in batch) else "w" + with tarfile.open(tar_path, mode) as tf: + for f in batch: + try: + tf.add(f, arcname=str(f)) + except (OSError, tarfile.TarError) as e: + print(f" [跳过] {f}: {e}") + size_mb = tar_path.stat().st_size / 1048576 + print(f"[备份] 批次 {i}/{len(batches)}: {tar_path.name} ({size_mb:.1f} MB), 上传中 ...") + try: + fid = _upload_tar(tar_path, chunk_mb) + except RuntimeError as e: + print(f"[错误] {e}") + return 1 + files_in_batch = [str(f) for f in batch if tarfile.open(tar_path).getnames()] + for f in batch: + try: + st = f.stat() + manifest.setdefault("files", {})[str(f)] = [st.st_size, int(st.st_mtime)] + except OSError: + pass + manifest.setdefault("batches", {})[tar_path.name] = { + "server_id": fid, "size": tar_path.stat().st_size, "files": files_in_batch, + } + _save_manifest(name, manifest) + print(f"[备份] 批次 {i} 完成: file_id={fid}") + tar_path.unlink(missing_ok=True) + print(f"[备份] {name} 完成, 共 {len(files)} 个文件") + return 0 + + +def _download_batch(file_id: str, out_dir: Path) -> Path: + """下载 + 解密备份批次 (复用 transfer/crypto 库), 返回还原的 tar 路径""" + import transfer as transfer_mod + from crypto import CryptoEngine + + client = transfer_mod.TransferClient(_server(), token=_token()) + enc_path, enc_params = client.download(file_id, out_dir / ".sz-backup.enc") + engine = CryptoEngine() + final = out_dir / str(enc_params.get("file_name", "backup.tar")) + with open(enc_path, "rb") as src, open(final, "wb") as dst: + engine.decrypt_stream(src, dst, enc_params["key_id"], + enc_params.get("context", "7z-encrypt:v1").encode(), + progress=lambda n: None) + enc_path.unlink(missing_ok=True) + return final + + +def restore(name: str, out_root: Path | None = None) -> int: + manifest = _load_manifest(name) + batches = manifest.get("batches", {}) + if not batches: + print(f"[恢复] {name}: 无备份记录") + return 1 + print(f"[恢复] {name}: {len(batches)} 个备份批次") + for tar_name, info in batches.items(): + dl = STATE_DIR / f"restore_{tar_name}" + dl.mkdir(parents=True, exist_ok=True) + try: + tar_src = _download_batch(info["server_id"], dl) + except Exception as e: + print(f"[错误] 下载 {tar_name} 失败: {e}") + return 1 + # 解包 (路径校验: 只解回 manifest 记录的文件) + with tarfile.open(tar_src) as tf: + for member in tf.getmembers(): + if member.name not in info.get("files", []): + continue + if out_root is not None: + rel = member.name.lstrip("/") + tf.extract(member, path=out_root / rel, filter="data") + else: + tf.extract(member, path=Path(member.name).parent, filter="data") + print(f"[恢复] 批次完成: {tar_name}") + print(f"[恢复] {name} 完成") + return 0 + + +def list_backups() -> int: + if not STATE_DIR.exists(): + print("[备份] 暂无备份记录") + return 0 + for mp in sorted(STATE_DIR.glob("*.json")): + name = mp.stem + m = _load_manifest(name) + batches = m.get("batches", {}) + total = sum(b["size"] for b in batches.values()) + print(f" {name}: {len(m.get('files', {}))} 文件, {len(batches)} 批, {total / 1048576:.1f} MB 已备份") + return 0 + + +def main() -> int: + ap = argparse.ArgumentParser(description="一键备份: 相册/聊天记录/文档 -> 加密服务器") + ap.add_argument("action", nargs="?", default="all", help="备份项: photos/documents/download/chat/all/list/restore") + ap.add_argument("target", nargs="?", help="restore 的备份项") + ap.add_argument("--chunk-size", type=int, default=10, help="分卷大小 MB (默认 10)") + args = ap.parse_args() + + if args.action == "list": + return list_backups() + if args.action == "restore": + if not args.target: + print("[错误] 用法: sz-backup restore ") + return 1 + return restore(args.target) + names = ["photos", "documents", "download", "chat"] if args.action == "all" else [args.action] + if args.action not in ("photos", "documents", "download", "chat", "all"): + print(f"[错误] 未知备份项: {args.action} (photos/documents/download/chat/all)") + return 1 + ok = True + for n in names: + if not _src_dirs(n): + print(f"[备份] {n}: 无源目录 (config backup.{n} 为空, 跳过)") + continue + ok = backup(n, args.chunk_size) == 0 and ok + return 0 if ok else 1 + + +if __name__ == "__main__": + sys.exit(main()) diff --git a/debian/7z-encrypt-client/usr/share/7z-encrypt/tui.py b/debian/7z-encrypt-client/usr/share/7z-encrypt/tui.py index 9f10516..6e8be77 100644 --- a/debian/7z-encrypt-client/usr/share/7z-encrypt/tui.py +++ b/debian/7z-encrypt-client/usr/share/7z-encrypt/tui.py @@ -455,6 +455,8 @@ def main() -> int: print(" 10. 登录") print(" 11. 注销") print(" 12. 重新生成密钥") + print(" 13. 一键备份 (相册/文档/下载)") + print(" 14. 恢复备份") print(" q. 退出") choice = input("> ").strip().lower() if choice == "1": @@ -495,11 +497,37 @@ def main() -> int: continue # 注销后回未登录界面 elif choice == "12": regenerate_key() + elif choice == "13": + backup_now() + elif choice == "14": + restore_backup() elif choice == "q": print("再见") return 0 else: - print("[提示] 请选择 1-12 或 q") + print("[提示] 请选择 1-14 或 q") + + +def backup_now() -> None: + """菜单 13: 一键备份 (相册/文档/下载/聊天记录)""" + print("--- 一键备份 ---") + print(" 备份项: photos (相册) / documents (文档) / download (下载) / chat (聊天记录)") + print(" 源目录在 config.json 的 backup 段配置, 增量备份只传新文件") + names = _clean(input(" 备份项 (回车=全部): ").strip()) + if names: + run(["backup.py"] + names.split()) + else: + run(["backup.py"]) + + +def restore_backup() -> None: + """菜单 14: 恢复备份""" + print("--- 恢复备份 ---") + name = _clean(input(" 备份项 (photos/documents/download/chat): ").strip()) + if not name: + print("[提示] 已取消") + return + run(["backup.py", "restore", name]) if __name__ == "__main__": diff --git a/debian/rules b/debian/rules index 56fb255..f59c010 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,7 @@ override_dh_auto_test: override_dh_auto_install: # --- 源码版 (all): 客户端源码 + wrapper --- mkdir -p debian/7z-encrypt-client/usr/share/7z-encrypt - cp transfer.py metadata.py crypto.py splitter.py config.py state.py \ + cp transfer.py metadata.py crypto.py splitter.py config.py state.py backup.py \ debian/7z-encrypt-client/usr/share/7z-encrypt/ cp ../tui/scripts/tui.py debian/7z-encrypt-client/usr/share/7z-encrypt/ mkdir -p debian/7z-encrypt-client/usr/bin @@ -19,12 +19,15 @@ override_dh_auto_install: > debian/7z-encrypt-client/usr/bin/sz-tui printf '#!/bin/sh\nexec /usr/share/7z-encrypt/.venv/bin/python /usr/share/7z-encrypt/config.py "$$@"\n' \ > debian/7z-encrypt-client/usr/bin/sz-config + printf '#!/bin/sh\nexec /usr/share/7z-encrypt/.venv/bin/python /usr/share/7z-encrypt/backup.py "$$@"\n' \ + > debian/7z-encrypt-client/usr/bin/sz-backup chmod 755 debian/7z-encrypt-client/usr/bin/sz-transfer \ debian/7z-encrypt-client/usr/bin/sz-tui \ - debian/7z-encrypt-client/usr/bin/sz-config + debian/7z-encrypt-client/usr/bin/sz-config \ + debian/7z-encrypt-client/usr/bin/sz-backup # --- 编译版 (amd64): Nuitka 二进制 --- mkdir -p debian/7z-encrypt-client-bin/usr/bin - cp bin/sz-transfer bin/sz-config debian/7z-encrypt-client-bin/usr/bin/ + cp bin/sz-transfer bin/sz-config bin/sz-backup debian/7z-encrypt-client-bin/usr/bin/ cp ../tui/bin/sz-tui debian/7z-encrypt-client-bin/usr/bin/ chmod 755 debian/7z-encrypt-client-bin/usr/bin/sz-transfer \ debian/7z-encrypt-client-bin/usr/bin/sz-tui \