Fix some problems based on reviewer's comments.

1. Add some common formats of video and picture.
2. Calculate the number dynamically based on the amount of files to be
renamed.
3. Fix the bugs of optional parameters.

Author: StepaniaH

commands/system/rename-vedios-pictures.py commands/system/rename-videos-pictures.py

@@ -7,7 +7,9 @@
 
 # Optional parameters:
 # @raycast.icon 📂
-# @raycast.argument1 { "type": "text", "placeholder": "Placeholder" }
+# @raycast.argument1 { "type": "text", "placeholder": "Directory's absolute path", "optional": false }
+# @raycast.argument2 { "type": "text", "placeholder": "Type (video/image/all)", "optional": true }
+# @raycast.argument3 { "type": "text", "placeholder": "Dry Run (true/false)", "optional": true }
 
 # Documentation:
 # @raycast.description This is a simple Python script for recursively renaming video and picture files within a directory. Type the root directory's absolute path, and it will scan all the video and picture files in it and rename them according to the folder where they are located as the format `<folder_name>-<current_date (MMDD)>-<incremental_number>`.
@@ -24,8 +26,8 @@ class RenameFilesAsDate:
     def __init__(self, root_directory):
         self.root_directory = os.path.expanduser(root_directory)
         self.error_files = {}
-        self.video_extensions = ('.mp4', '.avi', '.mov', '.mkv', '.wmv')
-        self.image_extensions = ('.jpg', '.jpeg', '.png', '.gif', 'webp')
+        self.video_extensions = ('.mp4', '.avi', '.mov', '.mkv', '.wmv', '.flv', '.webm', '.m4v', '.3gp')
+        self.image_extensions = ('.jpg', '.jpeg', '.png', '.gif', '.webp', '.bmp', '.tiff', '.svg', '.heic')
 
     def rename_files(self, file_type='all', dry_run=False):
         current_date = datetime.datetime.now().strftime("%m%d")
@@ -39,13 +41,13 @@ def rename_files(self, file_type='all', dry_run=False):
     def _is_already_renamed(self, filename, current_date):
         """Check if the file has been named according to the target format"""
         base_name = os.path.splitext(filename)[0]
-        pattern = re.compile(f'^.*-{current_date}-\\d{{2}}$')
+        pattern = re.compile(f'^.*-{current_date}-\\d+$')
         return bool(pattern.match(base_name))
 
     def _get_max_sequence_number(self, directory, current_date):
         """Get the largest serial number existing in the current directory"""
         max_seq = 0
-        pattern = re.compile(f'^.*-{current_date}-(\\d{{2}}).*$')
+        pattern = re.compile(f'^.*-{current_date}-(\\d+)$')
 
         for entry in os.listdir(directory):
             match = pattern.match(os.path.splitext(entry)[0])
@@ -73,11 +75,13 @@ def _process_directory(self, directory, current_date, file_type, dry_run):
         if files_to_rename:
             # Get the largest serial number existing in the current directory
             count = self._get_max_sequence_number(directory, current_date) + 1
+            total_files = len(files_to_rename)
+            num_digits = len(str(total_files + count - 1))
 
             # Rename collected files
             for entry in sorted(files_to_rename):  # Sort to ensure consistent rename order
                 entry_path = os.path.join(directory, entry)
-                new_name = f"{folder_name}-{current_date}-{count:02d}{os.path.splitext(entry)[1].lower()}"
+                new_name = f"{folder_name}-{current_date}-{count:0{num_digits}d}{os.path.splitext(entry)[1].lower()}"
                 new_path = os.path.join(directory, new_name)
 
                 if dry_run:
@@ -99,16 +103,25 @@ def _get_supported_extensions(self, file_type):
         return self.video_extensions + self.image_extensions
 
 def main():
-    parser = argparse.ArgumentParser(description='Rename video and image files with date pattern')
-    parser.add_argument('directory', help='Root directory to process')
-    parser.add_argument('--type', choices=['video', 'image', 'all'], 
-                        default='all', help='File type to process')
-    parser.add_argument('--dry-run', action='store_true',
-                        help='Show what would be done without actually renaming')
-
-    args = parser.parse_args()
-    renamer = RenameFilesAsDate(args.directory)
-    renamer.rename_files(args.type, args.dry_run)
+    args = sys.argv[1:] 
+
+    directory = None
+    file_type = 'all'
+    dry_run = False
+
+    if len(args) >= 1:
+        directory = args[0]
+    if len(args) >= 2 and args[1]:
+        file_type = args[1]
+    if len(args) >= 3 and args[2]:
+        dry_run = args[2].lower() == 'true'
+
+    if not directory:
+        print("Error: Directory argument is required.")
+        sys.exit(1)
+
+    renamer = RenameFilesAsDate(directory)
+    renamer.rename_files(file_type, dry_run)
 
 if __name__ == '__main__':
     main()