Refactor

Author: rexzhang

afw.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-import dataclasses
 import importlib
 import json
 import subprocess
@@ -13,8 +12,6 @@
 import click
 from ualfred import Workflow3
 
-from afw_runtime import afw_responses_to_feedback
-
 logger = Logger(__file__)
 
 AFW_RUNTIME_FILES = ["afw.py", "afw_runtime.py"]
@@ -116,8 +113,7 @@ def afw_entry(workflow):
     # Do stuff here ...
     from main import main as afw_workflow_main
 
-    responses = afw_workflow_main(args, workflow.logger)
-    feedback = afw_responses_to_feedback(responses)
+    feedback = afw_workflow_main(args, workflow.logger)
 
     # Add an item to Alfred feedback
     # wf.add_item(u'Item title', u'Item subtitle')
@@ -153,9 +149,8 @@ def test(workflow_path: str, query: str):
 
     wf = Workflow3()
 
-    responses = module.main(args=wf.args[2:], logger=logger)
-    for response in responses:
-        print(json.dumps(dataclasses.asdict(response), indent=4))
+    feedback = module.main(args=wf.args[2:], logger=logger)
+    print(json.dumps(feedback, indent=4))
 
 
 if __name__ == "__main__":

afw_runtime.py

@@ -1,5 +1,4 @@
 import dataclasses
-from typing import Optional
 
 from ualfred import (
     ICON_ACCOUNT,
@@ -84,47 +83,74 @@ def afw_responses_to_feedback(responses: list[AFWResponse]) -> list[dict]:
 
 
 class AFWFuncAbc:
+    _icon_success = ICON_INFO
+    _icon_default = ICON_INFO
+    _icon_error = ICON_ERROR
+    _icon_tip = ICON_NOTE
+
     def __init__(self, args: list[str], logger) -> None:
         self.args = args
         self.logger = logger
 
     @property
-    def _data_defaulte(self) -> list:
+    def _data_success(self) -> list:
         raise NotImplementedError
 
     @property
-    def _data_tips(self) -> list:
+    def _data_defaulte(self) -> list:
         raise NotImplementedError
 
     @property
-    def _data_success(self) -> list:
+    def _data_error(self) -> list:
         raise NotImplementedError
 
     @property
-    def _data_error(self) -> list:
+    def _data_tips(self) -> list:
         raise NotImplementedError
 
-    def get_response_success(self) -> list[AFWResponse]:
-        return [
+    @staticmethod
+    def _afw_response_to_feedback_data(responses: list[AFWResponse]) -> list[dict]:
+        result = list()
+        for obj in responses:
+            data = dataclasses.asdict(obj)
+            for k in list(data.keys()):
+                if data[k] is None:
+                    data.pop(k)
+
+            result.append(data)
+
+        return result
+
+    def get_feedback_success(self) -> list[dict]:
+        responses = [
             AFWResponse(
-                title=title, arg=title, subtitle=subtitle, icon=ICON_INFO, valid=True
+                title=title,
+                arg=title,
+                subtitle=subtitle,
+                icon=self._icon_success,
+                valid=True,
             )
             for title, subtitle in self._data_success
         ] + [
             AFWResponse(
-                title=title, arg=title, subtitle=subtitle, icon=ICON_NOTE, valid=False
+                title=title,
+                arg=title,
+                subtitle=subtitle,
+                icon=self._icon_tip,
+                valid=False,
             )
             for title, subtitle in self._data_tips
         ]
+        return self._afw_response_to_feedback_data(responses)
 
-    def get_response_fail(self) -> list[AFWResponse]:
-        return (
+    def get_feedback_fail(self) -> list[dict]:
+        responses = (
             [
                 AFWResponse(
                     title=title,
                     arg=title,
                     subtitle=subtitle,
-                    icon=ICON_ERROR,
+                    icon=self._icon_error,
                     valid=False,
                 )
                 for title, subtitle in self._data_error
@@ -134,7 +160,7 @@ def get_response_fail(self) -> list[AFWResponse]:
                     title=title,
                     arg=title,
                     subtitle=subtitle,
-                    icon=ICON_INFO,
+                    icon=self._icon_default,
                     valid=True,
                 )
                 for title, subtitle in self._data_defaulte
@@ -144,18 +170,19 @@ def get_response_fail(self) -> list[AFWResponse]:
                     title=title,
                     arg=title,
                     subtitle=subtitle,
-                    icon=ICON_NOTE,
+                    icon=self._data_tips,
                     valid=False,
                 )
                 for title, subtitle in self._data_tips
             ]
         )
+        return self._afw_response_to_feedback_data(responses)
 
     def _process(self) -> bool:
         raise NotImplementedError
 
-    def __call__(self) -> list[AFWResponse]:
+    def __call__(self) -> list[dict]:
         if self._process():
-            return self.get_response_success()
+            return self.get_feedback_success()
 
-        return self.get_response_fail()
+        return self.get_feedback_fail()

afw_time_converter/__init__.py

@@ -1 +1 @@
-from .workflow_main import call_workflow
+from .main import main

afw_time_converter/main.py

@@ -1,7 +1,14 @@
 import re
 
 import arrow
-from afw_runtime import *
+
+from afw_runtime import (
+    ICON_CLOCK,
+    ICON_HELP,
+    ICON_NOTE,
+    AFWResponse,
+    afw_responses_to_feedback,
+)
 
 DEFAULT_RESPONSE = [
     AFWResponse(
@@ -202,5 +209,4 @@ def get_feedback(self):
 
 
 def main(args: list[str], logger) -> list[AFWResponse]:
-    time_convert = Time(args, logger)
-    return time_convert()
+    return afw_responses_to_feedback(Time(args, logger)())

afw_uuid_tool/main.py

@@ -21,19 +21,15 @@ def _make_data_from_uuid(u: uuid.UUID) -> list[AFWResponse]:
             ),
         )
 
+    @property
+    def _data_success(self) -> list:
+        return self._make_data_from_uuid(self._u)
+
     @property
     def _data_defaulte(self) -> list:
         u = uuid.uuid4()
         return self._make_data_from_uuid(u)
 
-    @property
-    def _data_tips(self) -> list:
-        return list()
-
-    @property
-    def _data_success(self) -> list:
-        return self._make_data_from_uuid(self._u)
-
     @property
     def _data_error(self) -> list:
         return [
@@ -42,6 +38,10 @@ def _data_error(self) -> list:
             # ("Examples: 1111", ""),
         ]
 
+    @property
+    def _data_tips(self) -> list:
+        return list()
+
     def _process(self) -> list[AFWResponse]:
         try:
             if len(self.args) == 0: