From afd7ef063571bfa9bcba4e17d81d25322915ba01 Mon Sep 17 00:00:00 2001 From: Vigers Ray Date: Mon, 16 Jun 2025 01:47:28 +0300 Subject: [PATCH] =?UTF-8?q?=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/publish.yml | 4 ++-- ...ove_sunrise_private.py => move_private.py} | 19 +++++++++++++------ 2 files changed, 15 insertions(+), 8 deletions(-) rename Tools/_sunrise/{move_sunrise_private.py => move_private.py} (56%) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 65a4dd539b..577d9a9d76 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -31,8 +31,8 @@ jobs: path: SunrisePrivate ssh-key: ${{ secrets.SUNRISE_PRIVATE_REPO_SSH_KEY }} - - name: Move SunrisePrivate files - run: python3 Tools/_sunrise/move_sunrise_private.py + - name: Move Sunrise Private files + run: python3 Tools/_sunrise/move_private.py --clone-dir "SunrisePrivate" --target-dirs "Resources" "Content.Client" "Content.Server" "Content.Shared" - name: Setup .NET Core uses: actions/setup-dotnet@v4.1.0 diff --git a/Tools/_sunrise/move_sunrise_private.py b/Tools/_sunrise/move_private.py similarity index 56% rename from Tools/_sunrise/move_sunrise_private.py rename to Tools/_sunrise/move_private.py index 1768b94fd6..9d4f568ace 100644 --- a/Tools/_sunrise/move_sunrise_private.py +++ b/Tools/_sunrise/move_private.py @@ -1,8 +1,14 @@ import os import shutil +import argparse -CLONE_DIR = "SunrisePrivate" -TARGET_DIRS = ["Resources", ".github", "Content.Client", "Content.Server", "Content.Shared", "Content.Packaging"] +def parse_args(): + parser = argparse.ArgumentParser(description='Move files from SunrisePrivate repository') + parser.add_argument('--clone-dir', required=True, + help='Directory containing the cloned repository') + parser.add_argument('--target-dirs', nargs='+', required=True, + help='List of target directories to move') + return parser.parse_args() def merge_directories(src_dir, dst_dir): for item in os.listdir(src_dir): @@ -18,9 +24,9 @@ def merge_directories(src_dir, dst_dir): os.remove(dst_item) shutil.copy2(src_item, dst_item) -def move_directories(): - for directory in TARGET_DIRS: - src = os.path.join(CLONE_DIR, directory) +def move_directories(clone_dir, target_dirs): + for directory in target_dirs: + src = os.path.join(clone_dir, directory) dst = directory if os.path.exists(src): print(f"Transfer {directory} ...") @@ -30,7 +36,8 @@ def move_directories(): shutil.move(src, dst) def main(): - move_directories() + args = parse_args() + move_directories(args.clone_dir, args.target_dirs) print("Private files move") if __name__ == "__main__":