p4cmd 2.0.1__tar.gz → 2.0.3__tar.gz

{p4cmd-2.0.1 → p4cmd-2.0.3}/PKG-INFO

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

{p4cmd-2.0.1 → p4cmd-2.0.3}/p4cmd/p4cmd.py

@@ -24,6 +24,7 @@ class P4Client(object):
         :param silent: *bool* if True, suppresses error messages to cut down on terminal spam
         """
         self.perforce_root = perforce_root
+        self.silent = silent
 
         self.user = user
         self.client = client
@@ -46,7 +47,9 @@ class P4Client(object):
             if self.server is None:
                 raise p4errors.WorkSpaceError("Could not find P4PORT")
 
-        self.silent = silent
+
+        # print(self.user)
+        # print(self.client)
 
     @classmethod
     def from_env(cls, *args, **kwargs):
@@ -126,6 +129,21 @@ class P4Client(object):
 
         return dict_list
 
+    def get_ticket_expiration(self):
+        """
+        Get the time in seconds when the current authentication ticket will expire
+
+        :return: *int* seconds until authentication ticket expires or *None*
+        """
+        if not self.host_online():
+            return None
+        result = self.run_cmd("login", args=["-s"])
+        info_dict = result[0]
+        expiration_seconds = self.__get_dict_value(info_dict, "TicketExpiration", None)
+        if expiration_seconds is not None:
+            return int(expiration_seconds)
+        return None
+
     def get_p4_setting(self, setting):
         """
         Gets a Perforce setting
@@ -836,6 +854,11 @@ class P4Client(object):
                 if other_open in key and key != other_open:
                     value = self.__get_dict_value(file_dict, key)
                     opened_by.append(value)
+                action_owner = "actionOwner" if sys.version_info == 2 else "actionOwner".encode()
+                if action_owner in key:
+                    value = self.__get_dict_value(file_dict, key)
+                    value = value.decode() + "@" + self.find_p4_client()
+                    opened_by.append(value.encode())
 
             p4file.set_checked_out_by(opened_by)
 

{p4cmd-2.0.1 → p4cmd-2.0.3}/p4cmd/p4file.py

@@ -10,6 +10,8 @@ class Status:
     MOVED = "MOVED"
     UP_TO_DATE  = "UP_TO_DATE"
     UNKNOWN = "UNKNOWN"
+    DELETED = "DELETED"
+    MOVED_DELETED = "MOVED_DELETED"
 
 
 class P4File(object):
@@ -117,6 +119,10 @@ class P4File(object):
     def get_status(self):
         if self.is_marked_for_delete():
             return Status.OPEN_FOR_DELETE
+        if self.is_deleted():
+            return Status.DELETED
+        if self.is_moved_deleted():
+            return Status.MOVED_DELETED
         if self.needs_syncing():
             return Status.NEED_SYNC
         if self.is_depot_only():

{p4cmd-2.0.1 → p4cmd-2.0.3}/p4cmd.egg-info/PKG-INFO

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

{p4cmd-2.0.1 → p4cmd-2.0.3}/setup.py

@@ -7,7 +7,7 @@ data_files_to_include = ["*.png"]
 
 setuptools.setup(
     name="p4cmd",
-    version="2.0.1",
+    version="2.0.3",
     author="Niels Vaes",
     license='MIT',
     author_email="nielsvaes@gmail.com",