From 6c30ab0b6aa7049c71d5a163f7441d135aa6f108 Mon Sep 17 00:00:00 2001 From: TheRealMG <56460873+TheRealMG@users.noreply.github.com> Date: Fri, 18 Oct 2024 05:54:17 -0500 Subject: [PATCH] Added rebase flag to `Update Theme Timestamps` action (#582) * Update `updated at` field for `39907934-59e9-4e42-89f0-a254d3c5e280 ad97bb70-0066-4e42-9b5f-173a5e42c6fc bc25808c-a012-4c0d-ad9a-aa86be616019 ` * added rebase strategy to `Update Theme Timestamps` action * added indent for proper json formatting * added indent for proper formatting to `Rebuild Themes` as well * Added indent for proper formatting to `Submit Theme` --------- Co-authored-by: github-actions[bot] --- .github/workflows/update-theme-date.yml | 2 +- scripts/rebuild_themes.py | 2 +- scripts/submit_theme.py | 2 +- scripts/update_theme_date.py | 2 +- .../theme.json | 16 +--------------- .../theme.json | 18 +----------------- .../theme.json | 12 +----------- 7 files changed, 7 insertions(+), 47 deletions(-) diff --git a/.github/workflows/update-theme-date.yml b/.github/workflows/update-theme-date.yml index 76fb4b78..eae748ee 100644 --- a/.github/workflows/update-theme-date.yml +++ b/.github/workflows/update-theme-date.yml @@ -55,5 +55,5 @@ jobs: git add "themes/$theme/theme.json" done git commit -m "Update \`updated at\` field for \`$CHANGED_THEMES\`" - git pull origin main --strategy-option=theirs + git pull origin main --rebase --strategy-option=theirs git push origin main diff --git a/scripts/rebuild_themes.py b/scripts/rebuild_themes.py index c381f384..2ef4aed5 100644 --- a/scripts/rebuild_themes.py +++ b/scripts/rebuild_themes.py @@ -86,7 +86,7 @@ def main(): themes_data[theme] = theme_data with open(THEMES_DATA_FILE, "w") as f: - json.dump(themes_data, f) + json.dump(themes_data, f, indent=4) del themes_data preferences_data_file = os.path.join(theme_folder, "preferences.json") diff --git a/scripts/submit_theme.py b/scripts/submit_theme.py index 4fbfb3b2..96b7246c 100644 --- a/scripts/submit_theme.py +++ b/scripts/submit_theme.py @@ -384,7 +384,7 @@ Just joking, you can do whatever you want. You're the boss. download_image(image, f"themes/{theme_id}/{IMAGE_FILE}") with open(f"themes/{theme_id}/theme.json", "w") as f: - json.dump(theme, f) + json.dump(theme, f, indent=4) print(f"Theme submitted with ID: {theme_id}") for key, value in theme.items(): diff --git a/scripts/update_theme_date.py b/scripts/update_theme_date.py index 021bee40..ac483f75 100644 --- a/scripts/update_theme_date.py +++ b/scripts/update_theme_date.py @@ -41,7 +41,7 @@ def update_theme_date(theme_path): # Write the changes back to theme.json with open(theme_file, "w") as f: - json.dump(theme_data, f) + json.dump(theme_data, f, indent=4) print(f"Updated `updatedAt` for {theme_path} to {theme_data['updatedAt']}") diff --git a/themes/39907934-59e9-4e42-89f0-a254d3c5e280/theme.json b/themes/39907934-59e9-4e42-89f0-a254d3c5e280/theme.json index d81a4097..65ba9e47 100644 --- a/themes/39907934-59e9-4e42-89f0-a254d3c5e280/theme.json +++ b/themes/39907934-59e9-4e42-89f0-a254d3c5e280/theme.json @@ -1,15 +1 @@ -{ - "id": "39907934-59e9-4e42-89f0-a254d3c5e280", - "name": "Sidebery", - "description": "Tweaks to support Sidebery as an alternative to Zen's native tabs and workspace implementation.", - "homepage": "https://github.com/shanto/sidebery", - "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/39907934-59e9-4e42-89f0-a254d3c5e280/chrome.css", - "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/39907934-59e9-4e42-89f0-a254d3c5e280/readme.md", - "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/39907934-59e9-4e42-89f0-a254d3c5e280/image.png", - "author": "Shaan", - "version": "1.0.1", - "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/39907934-59e9-4e42-89f0-a254d3c5e280/preferences.json", - "tags": [], - "createdAt": "2024-10-09", - "updatedAt": "2024-10-13" -} \ No newline at end of file +{"id": "39907934-59e9-4e42-89f0-a254d3c5e280", "name": "Sidebery", "description": "Tweaks to support Sidebery as an alternative to Zen's native tabs and workspace implementation.", "homepage": "https://github.com/shanto/sidebery", "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/39907934-59e9-4e42-89f0-a254d3c5e280/chrome.css", "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/39907934-59e9-4e42-89f0-a254d3c5e280/readme.md", "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/39907934-59e9-4e42-89f0-a254d3c5e280/image.png", "author": "Shaan", "version": "1.0.1", "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/39907934-59e9-4e42-89f0-a254d3c5e280/preferences.json", "tags": [], "createdAt": "2024-10-09", "updatedAt": "2024-10-14"} \ No newline at end of file diff --git a/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/theme.json b/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/theme.json index b58f062d..5356c48c 100644 --- a/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/theme.json +++ b/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/theme.json @@ -1,17 +1 @@ -{ - "id": "ad97bb70-0066-4e42-9b5f-173a5e42c6fc", - "name": "SuperPins", - "description": "This Zen Mod enhances pinned tabs, by making some UI/UX changes.", - "homepage": "https://github.com/JLBlk/Zen-Themes/tree/main/SuperPins", - "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/chrome.css", - "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/readme.md", - "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/image.png", - "author": "JLBlk", - "version": "1.3.6", - "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/preferences.json", - "tags": [ - "tabs" - ], - "createdAt": "2024-08-28", - "updatedAt": "2024-10-13" -} \ No newline at end of file +{"id": "ad97bb70-0066-4e42-9b5f-173a5e42c6fc", "name": "SuperPins", "description": "This Zen Mod enhances pinned tabs, by making some UI/UX changes.", "homepage": "https://github.com/JLBlk/Zen-Themes/tree/main/SuperPins", "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/chrome.css", "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/readme.md", "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/image.png", "author": "JLBlk", "version": "1.3.6", "preferences": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/ad97bb70-0066-4e42-9b5f-173a5e42c6fc/preferences.json", "tags": ["tabs"], "createdAt": "2024-08-28", "updatedAt": "2024-10-14"} \ No newline at end of file diff --git a/themes/bc25808c-a012-4c0d-ad9a-aa86be616019/theme.json b/themes/bc25808c-a012-4c0d-ad9a-aa86be616019/theme.json index 609db69f..f6fbe783 100644 --- a/themes/bc25808c-a012-4c0d-ad9a-aa86be616019/theme.json +++ b/themes/bc25808c-a012-4c0d-ad9a-aa86be616019/theme.json @@ -1,11 +1 @@ -{ - "id": "bc25808c-a012-4c0d-ad9a-aa86be616019", - "name": "sleek border", - "description": "Sleek Zen browser borders with subtle opacity for a refined, modern look.", - "homepage": "", - "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/bc25808c-a012-4c0d-ad9a-aa86be616019/chrome.css", - "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/bc25808c-a012-4c0d-ad9a-aa86be616019/readme.md", - "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/bc25808c-a012-4c0d-ad9a-aa86be616019/image.png", - "author": "Lumio4u", - "version": "1.0.0" -} \ No newline at end of file +{"id": "bc25808c-a012-4c0d-ad9a-aa86be616019", "name": "sleek border", "description": "Sleek Zen browser borders with subtle opacity for a refined, modern look.", "homepage": "", "style": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/bc25808c-a012-4c0d-ad9a-aa86be616019/chrome.css", "readme": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/bc25808c-a012-4c0d-ad9a-aa86be616019/readme.md", "image": "https://raw.githubusercontent.com/zen-browser/theme-store/main/themes/bc25808c-a012-4c0d-ad9a-aa86be616019/image.png", "author": "Lumio4u", "version": "1.0.0", "createdAt": "2024-10-14", "updatedAt": "2024-10-14", "tags": []} \ No newline at end of file