Fixed refresh script, changed versions

.internal/Sources/refresh.py

@@ -6,6 +6,7 @@ import subprocess
 import tempfile
 from pathlib import Path
 import argparse
+import os
 
 # Load configuration from config.ini
 config = configparser.ConfigParser()
@@ -109,21 +110,29 @@ def update_setup_file(setup_file_path, zip_files, base_url):
     with open(setup_file_path, 'r') as file:
         lines = file.readlines()
 
-    table_header_found = False
+    # Find the table in the setup.md file
-    table_alignment_found = False
     table_start_index = None
     table_end_index = None
 
-    # Identify the table header and alignment rows
+    # Look for a line containing "Version" and "Download" and "SHA1" to identify the table header
     for index, line in enumerate(lines):
-        if line.strip() == '| Version | Download | SHA1 Hash |':
+        if '|' in line and 'Version' in line and 'Download' in line and 'SHA1' in line:
-            table_header_found = True
             table_start_index = index
-        elif table_header_found and line.strip() == '|:---:|:---:|---|':
+            # The next line should be the alignment row
-            table_alignment_found = True
+            if index + 1 < len(lines) and '|:' in lines[index + 1]:
-        elif table_header_found and table_alignment_found and line.strip() == '':
+                # Find the end of the table - look for the next line that doesn't start with '|'
-            table_end_index = index
+                for end_index in range(index + 2, len(lines)):
-            break
+                    if not lines[end_index].strip().startswith('|'):
+                        table_end_index = end_index
+                        break
+                # If we reached the end of the file
+                if table_end_index is None:
+                    table_end_index = len(lines)
+                break
+
+    print(f"Table detected: start={table_start_index}, end={table_end_index}")
+
+    new_lines = lines  # Initialize new_lines to avoid UnboundLocalError
 
     if table_start_index is not None and table_end_index is not None:
         # Prepare to insert new rows
@@ -163,18 +172,48 @@ def update_setup_file(setup_file_path, zip_files, base_url):
         else:
             print("No new rows to add.")
 
+        # Get the last modification time of setup.md
+        setup_mtime = os.path.getmtime(setup_file_path)
+        
+        # Recalculate SHA1 for all ZIP files
+        for zip_file in zip_files:
+            version = extract_version_info(zip_file)
+            if version:
+                # Check if ZIP file was modified after setup.md
+                if os.path.getmtime(zip_file) > setup_mtime:
+                    new_sha1 = calculate_sha1(zip_file)
+                    # Find and update the corresponding line
+                    for i, line in enumerate(new_lines):
+                        if version in line and 'Click here' in line:
+                            # Update the SHA1 checksum in the line
+                            new_lines[i] = re.sub(r'`[a-f0-9]{40}`', f'`{new_sha1}`', line)
+                            print(f"Force updating {version} due to file modification")
+                            break
+
     with open(setup_file_path, 'w') as file:
+        print(f'Writing {len(new_lines)} lines to {setup_file_path}')
         file.writelines(new_lines)
 
+    # Verify changes
+    with open(setup_file_path, 'r') as file:
+        content = file.read()
+        print(f'Current content of {setup_file_path}:\n{content}')
+
 def commit_and_push_changes():
     """Commit and push changes to the repository."""
     print(f"Committing and pushing changes to {REPO_DIR}")
+    # Add the file to the index
     run_command(f'cd {REPO_DIR} && git add {SETUP_FILE_PATH}')
-    result = run_command(f'cd {REPO_DIR} && git commit -m "Update vehicle setup file with correct paths and SHA1 checksums"')
+    
-    if 'nothing to commit' in result:
+    # Check if there are changes to commit
-        print("No changes detected.")
+    status = run_command(f'cd {REPO_DIR} && git status --porcelain')
-    else:
+    if not status.strip():
-        run_command(f'cd {REPO_DIR} && git push origin {BRANCH}')
+        print("No changes to commit.")
+        return
+        
+    # Commit and push if there are changes
+    run_command(f'cd {REPO_DIR} && git commit -m "Update vehicle setup file with correct paths and SHA1 checksums"')
+    run_command(f'cd {REPO_DIR} && git push origin {BRANCH}')
 
 def cleanup():
     """Remove the temp directory."""
@@ -189,7 +228,7 @@ def main():
     paths = get_version_paths(args.version)
     global REPO_URL, REPO_DIR, SETUP_FILE_PATH, RESOURCE_PACK_DIR, BASE_URL, VERSIONS_FILE_PATH
 
-    REPO_URL = f'https://{USERNAME}:{PASSWORD}@git.sbdevelopment.tech/SBDevelopment/docs'
+    REPO_URL = f'https://{USERNAME}:{PASSWORD}@git.sbdevelopment.tech/SBDevelopment/SBDocs'
     REPO_DIR = tempfile.mkdtemp()
     SETUP_FILE_PATH = paths['setup_file_path']
     RESOURCE_PACK_DIR = paths['resource_pack_dir']

.internal/Sources/versions_v2.txt

@@ -12,5 +12,4 @@
 22#1.20.3-1.20.4
 32#1.20.5-1.20.6
 34#1.21-1.21.1
-42#1.21.2-1.21.3
+42#1.21.2-1.21.3
-46#1.21.4

.internal/Sources/versions_v3.txt

@@ -1,6 +1,3 @@
-4#1.13.2-1.14.4
-5#1.15.2-1.16.1
-6#1.16.2-1.16.5
 7#1.17-1.17.1
 8#1.18-1.18.2
 9#1.19-1.19.2