p4cmd 2.8.2__tar.gz → 2.8.5__tar.gz

{p4cmd-2.8.2 → p4cmd-2.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p4cmd
-Version: 2.8.2
+Version: 2.8.5
 Summary: Simple P4 python module
 Home-page: https://github.com/nielsvaes/p4cmd
 Author: Niels Vaes

{p4cmd-2.8.2 → p4cmd-2.8.5}/p4cmd/__init__.py

@@ -1,4 +1,4 @@
-VERSION = "2.8.2"
+VERSION = "2.8.5"
 
 from .p4cmd import P4Client
 from .p4file import P4File

{p4cmd-2.8.2 → p4cmd-2.8.5}/p4cmd/p4cmd.py

@@ -243,7 +243,7 @@ class P4Client(object):
             return p4files
 
     @validate_not_empty
-    def folder_to_p4files(self, folder, include_subfolders=True, allow_invalid_files=False):
+    def folder_to_p4files(self, folder, include_subfolders=True, allow_invalid_files=False, specific_file_filter=""):
         """
         Returns all the files in a folder as a list of P4File objects. Uses the files_to_p4files function if the host
         is offline
@@ -252,14 +252,25 @@ class P4Client(object):
         :param include_subfolders: *bool*
         :param allow_invalid_files:  *bool* if set to False, this function will skip any files that are deleted or
         marked for delte
+        :param specific_file_filter: *string* will only return files that have this specific string in it. Can be used
+        for file extensions or just part of the file
         :return: *list* P4Files
         """
 
+        folder = folder.rstrip(r"/")
+        folder = folder.rstrip(r"\\")
+
         if self.host_online():
             if include_subfolders:
-                folder = folder + "..." if folder.endswith("/") or folder.endswith("\\") else folder + "/..."
+                if specific_file_filter:
+                    folder = folder + f"/.../*{specific_file_filter}*"
+                else:
+                    folder = folder + "/..."
             else:
-                folder = folder + "*" if folder.endswith("/") or folder.endswith("\\") else folder + "/*"
+                if specific_file_filter:
+                    folder = folder + f"/*{specific_file_filter}*"
+                else:
+                    folder = folder + "/*"
 
             fstat_output = self.run_cmd("fstat", file_list=[folder])
             p4files = self.fstat_to_p4_files(fstat_output, allow_invalid_files=allow_invalid_files)
@@ -269,13 +280,13 @@ class P4Client(object):
             if include_subfolders:
                 all_files = []
                 for root, dirs, files in os.walk(folder):
-                    for file_name in files:
+                    for file_name in [f for f in files if specific_file_filter in f]:
                         complete_file_path = os.path.join(root, file_name)
-                        if not complete_file_path in files:
+                        if not complete_file_path in all_files:
                             all_files.append(complete_file_path)
             else:
                 all_files = [os.path.join(folder, file) for file in os.listdir(folder) if
-                             os.path.isfile(os.path.join(folder, file))]
+                             os.path.isfile(os.path.join(folder, file)) and specific_file_filter in file]
 
             return self.files_to_p4files(all_files)
 
@@ -582,11 +593,14 @@ class P4Client(object):
         return info_dicts
 
     @validate_not_empty
-    def reconcile_offline_files(self, file_list, changelist="default"):
+    def reconcile_offline_files(self, file_list, add=True, edit=True, delete=True, changelist="default"):
         """
         Adds, opens for edit or delete any files that were changed outside Perforce
 
         :param file_list: *list* of local files
+        :param add: *bool* if True, adds new files
+        :param edit: *bool* if True, opens modified files for edit
+        :param delete: *bool* if True, marks deleted files for delete
         :param changelist: string or int value
         :return: *list* of info dicts
         """
@@ -594,15 +608,37 @@ class P4Client(object):
 
         changelist = self.__ensure_changelist(changelist)
 
-        info_dicts = self.run_cmd("reconcile", args=["-c", changelist], file_list=file_list)
+        # Build args based on which operations are enabled
+        args = ["-c", changelist]
+        
+        # Add flags for specific operations
+        if not add and not edit and not delete:
+            # If nothing is enabled, don't do anything
+            return []
+        elif add and edit and delete:
+            # Default behavior - reconcile everything (no additional flags needed)
+            pass
+        else:
+            # Specific operations requested
+            if add:
+                args.append("-a")
+            if edit:
+                args.append("-e")
+            if delete:
+                args.append("-d")
+
+        info_dicts = self.run_cmd("reconcile", args=args, file_list=file_list)
         return info_dicts
 
     @validate_not_empty
-    def reconcile_offline_folders(self, folder_list, changelist="default"):
+    def reconcile_offline_folders(self, folder_list, add=True, edit=True, delete=True, changelist="default"):
         """
         Adds, opens for edit or delete any files in the rootfolder + subfolders that were changed outside Perforce
 
         :param folder_list: *list* folders
+        :param add: *bool* if True, adds new files
+        :param edit: *bool* if True, opens modified files for edit
+        :param delete: *bool* if True, marks deleted files for delete
         :param changelist: string or int value
         :return: *list* of info dicts
         """
@@ -619,7 +655,26 @@ class P4Client(object):
 
         changelist = self.__ensure_changelist(changelist)
 
-        info_dicts = self.run_cmd("reconcile", args=["-c", changelist], file_list=cleaned_folder_list)
+        # Build args based on which operations are enabled
+        args = ["-c", changelist]
+        
+        # Add flags for specific operations
+        if not add and not edit and not delete:
+            # If nothing is enabled, don't do anything
+            return []
+        elif add and edit and delete:
+            # Default behavior - reconcile everything (no additional flags needed)
+            pass
+        else:
+            # Specific operations requested
+            if add:
+                args.append("-a")
+            if edit:
+                args.append("-e")
+            if delete:
+                args.append("-d")
+
+        info_dicts = self.run_cmd("reconcile", args=args, file_list=cleaned_folder_list)
         return info_dicts
 
     @validate_not_empty

{p4cmd-2.8.2 → p4cmd-2.8.5}/p4cmd.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: p4cmd
-Version: 2.8.2
+Version: 2.8.5
 Summary: Simple P4 python module
 Home-page: https://github.com/nielsvaes/p4cmd
 Author: Niels Vaes