Add backup'API

Author: zhaojing1987

apphub/build/lib/cli/apphub_cli.py

@@ -1,11 +1,15 @@
 import sys
 import os
+import uuid
 import json
+import shutil
+import requests
 import subprocess
 
 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
 
 import click
+from dotenv import dotenv_values, set_key,unset_key
 from src.services.apikey_manager import APIKeyManager
 from src.services.settings_manager import SettingsManager
 from src.core.exception import CustomException
@@ -69,30 +73,191 @@ def getconfig(section, key):
         raise click.ClickException(str(e))
 
 @cli.command()
-@click.option('--appname',required=True, help='The App Name')
-@click.option('--appid',required=True, help='The App Id')
-@click.option('--github_email', help='The Github Email')
-@click.option('--github_user', help='The Github User')
-def push(appname, appid, github_email, github_user):
-    """Push the app to the Github"""
-    # 从配置文件读取gitea的用户名和密码
-    try:
-        giteat_user = ConfigManager().get_value("gitea", "user_name")
-        giteat_pwd = ConfigManager().get_value("gitea", "user_pwd")
+@click.option('--section',required=True, help='The section name')
+@click.option('--key', required=True, help='The key name')
+def getsysconfig(section, key):
+    """Get a system config value"""
+    try:          
+        system_config_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '../config/system.ini'))
+        settings_manager = SettingsManager()
+        settings_manager.config_file_path = system_config_path 
+
+        if key is None: 
+            value = SettingsManager().read_section(section)
+            value = json.dumps(value)
+            click.echo(f"{value}")
+        else:
+            value = SettingsManager().read_key(section, key)
+            click.echo(f"{value}")
     except CustomException as e:
         raise click.ClickException(e.details)
     except Exception as e:
         raise click.ClickException(str(e))
+    
+@cli.command()
+@click.option('--appid',required=True, help='The App Id')
+@click.option('--github_token', required=True, help='The Github Token')
+def commit(appid, github_token):
+    """Commit the app to the Github"""
+    try:
+        # 从配置文件读取gitea的用户名和密码
+        gitea_user = ConfigManager().get_value("gitea", "user_name")
+        gitea_pwd = ConfigManager().get_value("gitea", "user_pwd")
+    
+        # 将/tmp目录作为工作目录，如果不存在则创建，如果存在则清空
+        work_dir = "/tmp/git"
+        if os.path.exists(work_dir):
+            shutil.rmtree(work_dir)
+        os.makedirs(work_dir)
+        os.chdir(work_dir)
+
+        # 执行git clone命令：将gitea仓库克隆到本地
+        gitea_repo_url = f"http://{gitea_user}:{gitea_pwd}@websoft9-git:3000/websoft9/{appid}.git"
+        subprocess.run(["git", "clone", gitea_repo_url], check=True)
+
+        # 执行git clone命令：将github仓库克隆到本地(dev分支)
+        github_repo_url = f"https://github.com/Websoft9/docker-library.git"
+        subprocess.run(["git", "clone", "--branch", "dev", github_repo_url], check=True)
+
+        # 解析gitea_repo_url下载的目录下的.env文件
+        gitea_env_path = os.path.join(work_dir, appid, '.env')
+        gitea_env_vars = dotenv_values(gitea_env_path)
+        w9_app_name = gitea_env_vars.get('W9_APP_NAME')
 
-    # 拼接git仓库的url
-    repo_url = f"http://{giteat_user}:{giteat_pwd}@websoft9-git:3000/websoft9/{appid}.git"
+        if not w9_app_name:
+            raise click.ClickException("W9_APP_NAME not found in Gitea .env file")
+        
+        # 解析github_repo_url下载的目录下的/apps/W9_APP_NAME目录下的.env文件
+        github_env_path = os.path.join(work_dir, 'docker-library', 'apps', w9_app_name, '.env')
+        github_env_vars = dotenv_values(github_env_path)
 
-    # 执行git clone命令
+        # 需要复制的变量
+        env_vars_to_copy = ['W9_URL', 'W9_ID']
+        port_set_vars = {key: value for key, value in github_env_vars.items() if key.endswith('PORT_SET')}
+
+        # 将这些值去替换gitea_repo_url目录下.env中对应项的值
+        for key in env_vars_to_copy:
+            if key in github_env_vars:
+                set_key(gitea_env_path, key, github_env_vars[key])
+
+        for key, value in port_set_vars.items():
+            set_key(gitea_env_path, key, value)
+
+        # 删除W9_APP_NAME
+        unset_key(gitea_env_path, 'W9_APP_NAME')
+
+        # 将整个gitea目录覆盖到docker-library/apps/w9_app_name目录
+        gitea_repo_dir = os.path.join(work_dir, appid)
+        github_app_dir = os.path.join(work_dir, 'docker-library', 'apps', w9_app_name)
+        if os.path.exists(github_app_dir):
+            shutil.rmtree(github_app_dir)
+        shutil.copytree(gitea_repo_dir, github_app_dir)
+
+        # 切换到docker-library目录
+        os.chdir(os.path.join(work_dir, 'docker-library'))
+
+        # 创建一个新的分支
+        new_branch_name = f"update-{w9_app_name}-{uuid.uuid4().hex[:8]}"
+        subprocess.run(["git", "checkout", "-b", new_branch_name], check=True)
+
+        # 将修改提交到新的分支
+        subprocess.run(["git", "add", "."], check=True)
+        subprocess.run(["git", "commit", "-m", f"Update {w9_app_name}"], check=True)
+
+        # 推送新的分支到 GitHub
+        # subprocess.run(["git", "push", "origin", new_branch_name], check=True)
+
+        # 推送新的分支到 GitHub
+        github_push_url = f"https://{github_token}:x-oauth-basic@github.com/websoft9/docker-library.git"
+        subprocess.run(["git", "push", github_push_url, new_branch_name], check=True)
+
+        # 创建 Pull Request 使用 GitHub API
+        pr_data = {
+            "title": f"Update {w9_app_name}",
+            "head": new_branch_name,
+            "base": "dev",
+            "body": "Automated update"
+        }
+
+        response = requests.post(
+            f"https://api.github.com/repos/websoft9/docker-library/pulls",
+            headers={
+                "Authorization": f"token {github_token}",
+                "Accept": "application/vnd.github.v3+json"
+            },
+            data=json.dumps(pr_data)
+        )
+
+        if response.status_code != 201:
+            raise click.ClickException(f"Failed to create Pull Request: {response.json()}")
+
+        click.echo(f"Pull Request created: {response.json().get('html_url')}")
+
+    except subprocess.CalledProcessError as e:
+        raise click.ClickException(f"Command failed: {e}")
+    except Exception as e:
+        raise click.ClickException(str(e))
+    finally:
+        # 删除工作目录
+        if os.path.exists(work_dir):
+            shutil.rmtree(work_dir)
+
+@cli.command()
+@click.argument('target', required=True, type=click.Choice(['apps'], case_sensitive=False))
+@click.option('--dev', is_flag=True, help='Upgrade using dev environment')
+def upgrade(target, dev):
+    """Upgrade apps"""
     try:
-        subprocess.run(["git", "clone", repo_url])
+        if target == 'apps':
+            # 根据是否传入 --dev 参数设置 channel 和 package_name
+            channel = "dev" if dev else "release"
+            media_package = "media-dev.zip" if dev else "media-latest.zip"
+            library_package = "library-dev.zip" if dev else "library-latest.zip"
+
+            # 执行升级 media 的命令
+            if dev:
+                subprocess.run(
+                    [
+                        "bash", "/websoft9/script/update_zip.sh",
+                        "--channel", channel, "--package_name", media_package, "--sync_to", "/websoft9/media"
+                    ],
+                    check=True
+                )
+            else:
+                subprocess.run(
+                    [
+                        "bash", "/websoft9/script/update_zip.sh",
+                        "--channel", channel, "--package_name", media_package, "--sync_to", "/websoft9/media"
+                    ],
+                    check=True
+                )
+            click.echo(f"Media resources ({channel}) updated successfully.")
+
+            # 执行升级 library 的命令
+            if dev:
+                subprocess.run(
+                    [
+                        "bash", "/websoft9/script/update_zip.sh",
+                        "--channel", channel, "--package_name", library_package, "--sync_to", "/websoft9/library"
+                    ],
+                    check=True
+                )
+            else:
+                subprocess.run(
+                    [
+                        "bash", "/websoft9/script/update_zip.sh",
+                        "--channel", channel, "--package_name", library_package, "--sync_to", "/websoft9/library"
+                    ],
+                    check=True
+                )
+            click.echo(f"Library resources ({channel}) updated successfully.")
+        else:
+            click.echo(f"Unknown upgrade target: {target}")
+    except subprocess.CalledProcessError as e:
+        raise click.ClickException(f"Upgrade command failed: {e}")
     except Exception as e:
         raise click.ClickException(str(e))
 
 
 if __name__ == "__main__":
-    cli()
+    cli()

apphub/setup.py

@@ -4,7 +4,7 @@
 
 setup(
     name='apphub',
-    version='0.3',
+    version='0.4',
     packages=find_packages(where='src'),
     package_dir={'': 'src'},
     install_requires=[

apphub/src/api/v1/routers/backup.py

@@ -0,0 +1,73 @@
+from fastapi import APIRouter, Query, Path, Body
+from typing import Dict, List
+from src.schemas.errorResponse import ErrorResponse
+from src.services.back_manager import BackupManager
+from src.schemas.backupsnapshot import BackupSnapshot
+
+router = APIRouter()
+
+@router.post(
+    "/backup/{app_id}",
+    summary="Create Backup",
+    description="Create a backup for the specified app",
+    responses={
+        200: {"description": "Backup created successfully"},
+        400: {"model": ErrorResponse},
+        500: {"model": ErrorResponse},
+    },
+)
+def create_backup(
+    app_id: str = Path(..., description="App ID to create backup for")
+):
+    BackupManager().create_backup(app_id)
+    return {"message": f"Backup created successfully for app: {app_id}"}
+
+@router.get(
+    "/backup/snapshots",
+    summary="List Snapshots",
+    description="List all snapshots or filter by app ID",
+    responses={
+        200: {"model": List[BackupSnapshot]},
+        400: {"model": ErrorResponse},
+        500: {"model": ErrorResponse},
+    },
+)
+def list_snapshots(
+    app_id: str = Query(None, description="App ID to filter snapshots by (optional)"),
+):
+    snapshots = BackupManager().list_snapshots(app_id)
+    return snapshots
+
+@router.delete(
+    "/backup/snapshots/{snapshot_id}",
+    summary="Delete Snapshot",
+    description="Delete a snapshot by its ID",
+    status_code=204,
+    responses={
+        204: {"description": "Snapshot deleted successfully"},
+        400: {"model": ErrorResponse},
+        500: {"model": ErrorResponse},
+    },
+)
+def delete_snapshot(
+    snapshot_id: str = Path(..., description="Snapshot ID to delete"),
+):
+    BackupManager().delete_snapshot(snapshot_id)
+    return {"message": f"Snapshot {snapshot_id} deleted successfully"}
+
+@router.post(
+    "/backup/restore/{app_id}/{snapshot_id}",
+    summary="Restore Snapshot",
+    description="Restore a snapshot to the specified locations",
+    responses={
+        200: {"description": "Snapshot restored successfully"},
+        400: {"model": ErrorResponse},
+        500: {"model": ErrorResponse},
+    },
+)
+def restore_snapshot(
+    app_id: str = Path(..., description="App ID to restore"),
+    snapshot_id: str = Path(..., description="Snapshot ID to restore")
+):
+    BackupManager().restore_backup(app_id,snapshot_id)
+    return {"message": f"Snapshot {snapshot_id} restored successfully"}

apphub/src/apphub.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: apphub
-Version: 0.3
+Version: 0.4

apphub/src/cli/apphub_cli.py

@@ -1,3 +1,4 @@
+import configparser
 import sys
 import os
 import uuid
@@ -55,17 +56,51 @@ def setconfig(section, key, value):
         raise click.ClickException(str(e))
 
 @cli.command()
-@click.option('--section',required=True, help='The section name')
+@click.option('--section', help='The section name')
 @click.option('--key', help='The key name')
 def getconfig(section, key):
-    """Get a config value"""
-    try:          
-        if key is None: 
-            value = SettingsManager().read_section(section)
-            value = json.dumps(value)
+    """Get a config value or all config as JSON"""
+    try:
+        config_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '../config/config.ini'))
+        config = configparser.ConfigParser()
+        config.read(config_path, encoding="utf-8")
+        if section is None:
+            # 返回整个配置文件内容
+            all_config = {s: dict(config.items(s)) for s in config.sections()}
+            click.echo(json.dumps(all_config))
+        elif key is None:
+            # 返回指定 section 的内容
+            value = dict(config.items(section)) if section in config.sections() else {}
+            click.echo(json.dumps(value))
+        else:
+            # 返回指定 section 和 key 的内容
+            value = config.get(section, key) if config.has_option(section, key) else ""
             click.echo(f"{value}")
+    except CustomException as e:
+        raise click.ClickException(e.details)
+    except Exception as e:
+        raise click.ClickException(str(e))
+    
+@cli.command()
+@click.option('--section', help='The section name')
+@click.option('--key', help='The key name')
+def getsysconfig(section, key):
+    """Get a system config value or all system config as JSON"""
+    try:
+        system_config_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '../config/system.ini'))
+        config = configparser.ConfigParser()
+        config.read(system_config_path, encoding="utf-8")
+        if section is None:
+            # 返回整个 system.ini 文件内容
+            all_config = {s: dict(config.items(s)) for s in config.sections()}
+            click.echo(json.dumps(all_config))
+        elif key is None:
+            # 返回指定 section 的内容
+            value = dict(config.items(section)) if section in config.sections() else {}
+            click.echo(json.dumps(value))
         else:
-            value = SettingsManager().read_key(section, key)
+            # 返回指定 section 和 key 的内容
+            value = config.get(section, key) if config.has_option(section, key) else ""
             click.echo(f"{value}")
     except CustomException as e:
         raise click.ClickException(e.details)
@@ -236,6 +271,23 @@ def upgrade(target, dev):
     except Exception as e:
         raise click.ClickException(str(e))
 
+@cli.command()
+def getallconfig():
+    """Get all config.ini and system.ini data as JSON"""
+    try:
+        config_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '../config/config.ini'))
+        system_config_path = os.path.abspath(os.path.join(os.path.dirname(__file__), '../config/system.ini'))
+        config = configparser.ConfigParser()
+        system_config = configparser.ConfigParser()
+        config.read(config_path, encoding="utf-8")
+        system_config.read(system_config_path, encoding="utf-8")
+        result = {
+            "config": {s: dict(config.items(s)) for s in config.sections()},
+            "system": {s: dict(system_config.items(s)) for s in system_config.sections()}
+        }
+        click.echo(json.dumps(result))
+    except Exception as e:
+        raise click.ClickException(str(e))
 
 if __name__ == "__main__":
     cli()