Add timezone support

Author: rexzhang

README.md

@@ -4,7 +4,7 @@
 ![demo-basic](docs/demo-basic.gif)
 
 ## Get it
-Download from [Github release](https://github.com/rexzhang/alfred-workflow-time-converter/releases), double click package file.
+Download from [Github release](https://github.com/rexzhang/alfred-workflow-time-converter/releases), double click package file to install.
 
 ## Will
 - time zone

core.py

@@ -2,9 +2,10 @@
 # encoding: utf-8
 
 
+import re
+
 import arrow
-from dateutil import tz
-from workflow import ICON_CLOCK, ICON_NOTE
+from workflow import ICON_CLOCK, ICON_NOTE, ICON_ERROR
 
 FORMAT_LIST = (
     (ICON_NOTE, 'X', 'UTC Timestamp (s)'),
@@ -24,40 +25,134 @@
     # FORMAT_RFC3339
 )
 
+RE_TIMEZONE = '^[+-][0-9]{2}$'
+RE_SHIFT = '^[+-][0-9]+[smhdmy]$'
+
+
+class Time(object):
+    wf = None
+    _query = None
+
+    time = None
+    now = False
+
+    zone = None
+    shift = None
+
+    def __init__(self, wf):
+        self.wf = wf
+
+    @property
+    def query(self):
+        return self._query
+
+    @query.setter
+    def query(self, value):
+        self._query = value.strip(' ')
+
+    def do_parser(self):
+        self.wf.logger.debug('query string:{} {}'.format(
+            type(self.wf.args[0]), self.wf.args[0])
+        )
+
+        try:
+            self.query = self.wf.args[0].encode('utf8')
+        except IndexError:
+            self.wf.logger.debug('parser workflow args failed.')
+            return False
 
-def parser_query(wf):
-    """parser datetime, timezone, shift"""
-    try:
-        query = wf.args[0].encode('utf8').strip(' ').rstrip(' ')
+        while True:
+            if not self._parser_extend_info():
+                break
 
-        if query.isdigit():
-            query = int(query)
+        return self._parser_datetime()
 
-        wf.logger.debug('query string:{} {}'.format(type(query), query))
-        return arrow.get(query), False
+    def _parser_extend_info(self):
+        """parser timezone, shift"""
+        index = self.query.rfind(' ')
+        if index == -1:
+            query = ''
+            info = self.query
+        else:
+            query = self.query[:index]
+            info = self.query[index + 1:].strip(' ')
 
-    except (IndexError, arrow.ParserError):
-        wf.logger.debug('args:{}'.format(wf.args))
-        return arrow.get(), True
+        # time zone
+        if info.upper() == 'UTC' or info == '+00' or info == '-00':
+            self.query = query
+            self.zone = 'UTC'
+            self.wf.logger.debug('found zone info:'.format(self.zone))
+            return True
 
+        r = re.match(RE_TIMEZONE, info)
+        if r:
+            self.query = query
+            self.zone = info
+            self.wf.logger.debug('found zone info:'.format(self.zone))
+            return True
 
-def create_feedback(time, is_now):
-    f = list()
-    for icon, fmt, desc in FORMAT_LIST:
-        value = time.to(tz.tzlocal()).format(fmt)
-        # value = t.format(fmt)
+        # time shift TODO
 
-        f.append({
-            'title': value,
-            'subtitle': 'Current, {}'.format(desc) if is_now else desc,
-            'valid': True,
-            'arg': value,
-            'icon': icon,
-        })
+        return False
 
-    return f
+    def _parser_datetime(self):
+        """parser datetime"""
+        try:
+            if self.query.isdigit():
+                self.time = arrow.get(int(self.query))
+            else:
+                self.time = arrow.get(self.query)
+
+            return True
+
+        except arrow.ParserError:
+            self.wf.logger.debug(
+                'parser datetime error,query string:{}'.format(self.query)
+            )
+
+        if self.query == 'now' or self.query == '':
+            self.now = True
+            self.time = arrow.now()
+            return True
+
+        return False
+
+    def get_feedback(self):
+        if self.time is None:
+            return [{
+                'title': 'Please enter timestamp, datetime string, "now", or space',
+                'subtitle': 'Examples: 1607609661, 2020-12-10 22:14:33, now +08',
+                'valid': False,
+                'icon': ICON_ERROR,
+            }]
+
+        f = list()
+        for icon, fmt, desc in FORMAT_LIST:
+            if self.now:
+                subtitle = 'Now, {}'.format(desc)
+            else:
+                subtitle = desc
+
+            if self.zone:
+                self.time = self.time.to(self.zone[:3])
+                subtitle = '[{}]{}'.format(self.zone, subtitle)
+            else:
+                self.time = self.time.to('local')
+
+            value = self.time.format(fmt)
+            f.append({
+                'title': value,
+                'subtitle': subtitle,
+                'valid': True,
+                'arg': value,
+                'icon': icon,
+            })
+
+        return f
 
 
 def do_convert(wf):
-    time, is_now = parser_query(wf)
-    return create_feedback(time, is_now)
+    time = Time(wf)
+    time.do_parser()
+
+    return time.get_feedback()

info.plist

@@ -68,7 +68,7 @@
 				<key>subtext</key>
 				<string>Examples: 1607609661, 2020-12-10 22:14:33, now</string>
 				<key>title</key>
-				<string>Please enter timestamp, datetime string, or "now"</string>
+				<string>Please enter timestamp, datetime string, "now", or space</string>
 				<key>type</key>
 				<integer>0</integer>
 				<key>withspace</key>