p4cmd 2.8.4__tar.gz → 2.8.6__tar.gz

{p4cmd-2.8.4 → p4cmd-2.8.6}/PKG-INFO

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

{p4cmd-2.8.4 → p4cmd-2.8.6}/p4cmd/__init__.py

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

{p4cmd-2.8.4 → p4cmd-2.8.6}/p4cmd/p4cmd.py

@@ -229,7 +229,7 @@ class P4Client(object):
         file_list = convert_to_list(file_list) if not isinstance(file_list, list) else file_list
 
         if self.host_online():
-            fstat_output = self.run_cmd("fstat", file_list=file_list)
+            fstat_output = self.run_cmd("fstat", args=["-Ol"], file_list=file_list)
             p4files = self.fstat_to_p4_files(fstat_output, allow_invalid_files=allow_invalid_files)
             return p4files
         else:
@@ -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,16 +252,27 @@ 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])
+            fstat_output = self.run_cmd("fstat", args=["-Ol"], file_list=[folder])
             p4files = self.fstat_to_p4_files(fstat_output, allow_invalid_files=allow_invalid_files)
             return p4files
 
@@ -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)
 
@@ -1276,6 +1287,7 @@ class P4Client(object):
             p4file.set_action(self.__get_dict_value(file_dict, "action"))
             p4file.set_head_action(self.__get_dict_value(file_dict, "headAction"))
             p4file.set_raw_data(str(file_dict))
+            p4file.set_file_size(self.__get_dict_value(file_dict, "fileSize"))
 
             opened_by = []
             for key, value in file_dict.items():

{p4cmd-2.8.4 → p4cmd-2.8.6}/p4cmd/p4file.py

@@ -28,6 +28,7 @@ class P4File(object):
         self.__action = None
         self.__raw_data = None
         self.__head_action = None
+        self.__file_size = None
 
     def update_self(self, p4client):
         if self.__depot_file_path is not None:
@@ -213,6 +214,17 @@ class P4File(object):
     def set_last_submitted_by(self, value):
         self.__last_submitted_by = value
 
+    def set_file_size(self, value):
+        self.__file_size = value
+    
+    def get_file_size(self, in_megabyte=True):
+        try:
+            if in_megabyte:
+                return round(int(self.__file_size) / 1048576, 2)
+            return int(self.__file_size)
+        except:
+            return None
+
     def __eq__(self, other):
         if not isinstance(other, P4File):
             return NotImplemented
@@ -220,7 +232,8 @@ class P4File(object):
         private_attributes = [
             '_P4File__local_file_path', '_P4File__depot_file_path', '_P4File__last_submitted_by',
             '_P4File__have_revision', '_P4File__head_revision', '_P4File__checked_out_by',
-            '_P4File__last_submit_time', '_P4File__action', '_P4File__raw_data', '_P4File__head_action'
+            '_P4File__last_submit_time', '_P4File__action', '_P4File__raw_data', '_P4File__head_action',
+            '_P4File__file_size'
         ]
 
         for attr in private_attributes:

{p4cmd-2.8.4 → p4cmd-2.8.6}/p4cmd.egg-info/PKG-INFO

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