diff --git a/build.py b/build.py index c0a0013..84ce2a0 100644 --- a/build.py +++ b/build.py @@ -11,14 +11,11 @@ TARGET_FILE = "manifest.json" def zip_folder(output_name, folder, exclude_files, exclude_dirs): with zipfile.ZipFile(output_name, "w", zipfile.ZIP_DEFLATED) as zipf: for root, dirs, files in os.walk(folder): - # Exclude specified directories dirs[:] = [ d for d in dirs - if os.path.join(root, d).replace(folder + os.sep, "") - not in exclude_dirs + if os.path.relpath(os.path.join(root, d), folder) not in exclude_dirs ] - for file in files: rel_path = os.path.relpath(os.path.join(root, file), folder) if ( @@ -30,13 +27,11 @@ def zip_folder(output_name, folder, exclude_files, exclude_dirs): zipf.write(os.path.join(root, file), arcname=rel_path) -def update_version_line(file_path, new_base_version): +def update_version_line(file_path, new_version): with open(file_path, "r", encoding="utf-8") as f: lines = f.readlines() - new_version = f"{new_base_version}.0" updated = False - for i, line in enumerate(lines): match = re.match(r'\s*"version":\s*"([^"]+)"', line) if match: @@ -45,52 +40,63 @@ def update_version_line(file_path, new_base_version): r'"version":\s*".+?"', f'"version": "{new_version}"', line ) updated = True - print(f"🛠️ Changed version from {old_version} ➜ {new_version}") + print( + f"🛠️ Changed version in {file_path} from {old_version} ➜ {new_version}" + ) break if updated: with open(file_path, "w", encoding="utf-8") as f: f.writelines(lines) else: - print("⚠️ No version line found to update.") + print(f"⚠️ No version line found in {file_path}.") def main(): - base_version = input("Enter the new base version (e.g., 1.2.2): ").strip() + base_version = input("Enter the new base version (e.g., 2.0.1): ").strip() if not base_version: print("❌ No version entered. Exiting.") return + firefox_version = f"{base_version}.0" current_dir = os.getcwd() + manifest_path = os.path.join(current_dir, TARGET_FILE) + + # Determine what to exclude exclude_files = [SCRIPT_NAME] + [ f for f in os.listdir(current_dir) if f.endswith(".xpi") ] exclude_dirs = [".git"] - # 1. Create videospeed-github.xpi + # Step 1: Update manifest.json on disk + if os.path.exists(manifest_path): + update_version_line(manifest_path, base_version) + else: + print(f"❌ {TARGET_FILE} not found. Aborting.") + return + + # Step 2: Create GitHub .xpi archive zip_folder("videospeed-github.xpi", current_dir, exclude_files, exclude_dirs) print("✅ Created videospeed-github.xpi") - # 2. Prepare temporary folder + # Step 3: Prepare Firefox archive with version bumped to .0 with tempfile.TemporaryDirectory() as temp_dir: for item in os.listdir(current_dir): if item in exclude_files or item in exclude_dirs: continue - s = os.path.join(current_dir, item) - d = os.path.join(temp_dir, item) - if os.path.isdir(s): - shutil.copytree(s, d) + src = os.path.join(current_dir, item) + dst = os.path.join(temp_dir, item) + if os.path.isdir(src): + shutil.copytree(src, dst) else: - shutil.copy2(s, d) + shutil.copy2(src, dst) - # 3. Modify manifest.json version - manifest_path = os.path.join(temp_dir, TARGET_FILE) - if os.path.exists(manifest_path): - update_version_line(manifest_path, base_version) + temp_manifest = os.path.join(temp_dir, TARGET_FILE) + if os.path.exists(temp_manifest): + update_version_line(temp_manifest, firefox_version) else: - print(f"⚠️ {TARGET_FILE} not found in copied files.") + print(f"⚠️ {TARGET_FILE} not found in temp folder.") - # 4. Zip modified files zip_folder( "videospeed-firefox.xpi", temp_dir, exclude_files=[], exclude_dirs=[] ) diff --git a/manifest.json b/manifest.json index 4a260d8..893de6a 100644 --- a/manifest.json +++ b/manifest.json @@ -1,7 +1,7 @@ { "name": "Video Speed Controller", "short_name": "videospeed", - "version": "1.2.2", + "version": "1.3.0", "manifest_version": 2, "description": "Speed up, slow down, advance and rewind HTML5 audio/video with shortcuts", "homepage_url": "https://github.com/SoPat712/videospeed",