]> git.madduck.net Git - etc/taskwarrior.git/commitdiff

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

SerializingObject: Abstract datetime string conversion
authorTomas Babej <tomasbabej@gmail.com>
Sat, 8 Aug 2015 22:17:56 +0000 (00:17 +0200)
committerTomas Babej <tomasbabej@gmail.com>
Sat, 8 Aug 2015 22:23:58 +0000 (00:23 +0200)
tasklib/backends.py
tasklib/serializing.py

index 51285b544b8e31fd148b3f1ce3ff133f085fa6cd..2a00deeb56d32649d2ff136f059b06803ece9233 100644 (file)
@@ -67,6 +67,13 @@ class Backend(object):
         """Syncs the backend database with the taskd server"""
         pass
 
+    def convert_datetime_string(self, value):
+        """
+        Converts TW syntax datetime string to a localized datetime
+        object. This method is not mandatory.
+        """
+        raise NotImplemented
+
 
 class TaskWarriorException(Exception):
     pass
@@ -184,6 +191,19 @@ class TaskWarrior(object):
         else:
             return six.u("description:'{0}'").format(task._data['description'] or '')
 
+    def convert_datetime_string(self, value):
+
+        if self.version >= VERSION_2_4_0:
+            # For strings, use 'task calc' to evaluate the string to datetime
+            # available since TW 2.4.0
+            args = value.split()
+            result = self.execute_command(['calc'] + args)
+            naive = datetime.datetime.strptime(result[0], DATE_FORMAT_CALC)
+            localized = local_zone.localize(naive)
+        else:
+            raise ValueError("Provided value could not be converted to "
+                             "datetime, its type is not supported: {}"
+                             .format(type(value)))
 
     # Public interface
 
index 5d848ff1fe23028d2eaa9d32105e7d6be5d875dd..ed2881da0c3f30aa25281c7c5d4485f936224bf2 100644 (file)
@@ -25,8 +25,8 @@ class SerializingObject(object):
         to raise ValueError.
     """
 
-    def __init__(self, warrior):
-        self.warrior = warrior
+    def __init__(self, backend):
+        self.backend = backend
 
     def _deserialize(self, key, value):
         hydrate_func = getattr(self, 'deserialize_{0}'.format(key),
@@ -180,7 +180,7 @@ class SerializingObject(object):
         else:
             uuids = raw_uuids
 
-        return set(self.warrior.tasks.get(uuid=uuid) for uuid in uuids if uuid)
+        return set(self.backend.tasks.get(uuid=uuid) for uuid in uuids if uuid)
 
     def datetime_normalizer(self, value):
         """
@@ -205,14 +205,8 @@ class SerializingObject(object):
                 # If the value is already localized, there is no need to change
                 # time zone at this point. Also None is a valid value too.
                 localized = value
-        elif (isinstance(value, six.string_types)
-                and self.warrior.version >= VERSION_2_4_0):
-            # For strings, use 'task calc' to evaluate the string to datetime
-            # available since TW 2.4.0
-            args = value.split()
-            result = self.warrior.execute_command(['calc'] + args)
-            naive = datetime.datetime.strptime(result[0], DATE_FORMAT_CALC)
-            localized = local_zone.localize(naive)
+        elif isinstance(value, six.string_types):
+            localized = self.backend.convert_datetime_string(value)
         else:
             raise ValueError("Provided value could not be converted to "
                              "datetime, its type is not supported: {}"