Refactor

Author: rexzhang

afw.py

@@ -1,46 +1,19 @@
 #!/usr/bin/env python
 
+import importlib
 import json
 import subprocess
+import sys
 from pathlib import Path
 from uuid import uuid4
 from zipfile import ZipFile
 
 import click
+from ualfred import Workflow3
 
-FILENAME_LIST = (
-    "info.plist",
-    "entry_point.py",
-    "core.py",
-)
-
-PATH_LIST = (
-    "arrow",
-    "backports",
-    "dateutil",
-    "ualfred",
-)
-
-
-# def main():
-#     with open("version") as f:
-#         version = f.readline().rstrip("\n\r ")
-#
-#     zip_filename = f"time-converter.{version}.alfredworkflow"
-#     z = ZipFile(zip_filename, mode="w")
-#
-#     for filename in FILENAME_LIST:
-#         z.write(filename)
-#
-#     for pathname in PATH_LIST:
-#         for root, dirs, files in walk(pathname):
-#             for filename in files:
-#                 if filename.rfind(".pyc") == -1:
-#                     z.write(join(root, filename))
-#
-#     z.close()
-#
-#     print(f"Create Alfred workflow({zip_filename}) finished.")
+WORKFLOW_BASE_FILES = ["info.plist", "workflow_main.py", "__init__.py"]
+AFW_ENTRY_POINT_FILE = "afw_entry_point.py"
+AFW_REQUIREMENTS = []
 
 
 @click.group()
@@ -76,6 +49,7 @@ def build(workflow_path: str):
 
             requirements.append(line)
 
+    requirements += AFW_REQUIREMENTS
     for requirement in requirements:
         subprocess.run(
             ["pip", "install", "-U", f"--target={str(build_path)}", requirement],
@@ -99,22 +73,31 @@ def build(workflow_path: str):
         package_file.write(file, arcname=arc_name)
 
     print("Add workflow files...")
-    workflow_files: list[str] = ["info.plist", "main.py", "__init__.py"]
+    workflow_files: list[str] = WORKFLOW_BASE_FILES
     icon_file = package_info.get("icon")
     if icon_file:
         workflow_files.append(icon_file)
 
     for file in workflow_files:
         package_file.write(workflow_path.joinpath(file), arcname=file)
 
-    package_file.write("entry_point.py")
+    package_file.write(AFW_ENTRY_POINT_FILE)
 
     package_file.close()
     print(f"Create Alfred workflow[{package_path}] finished.")
 
 
 @cli.command()
-def test():
+@click.argument("workflow_path")
+@click.argument("query")
+def test(workflow_path: str, query: str):
+    try:
+        module = importlib.import_module(workflow_path)
+    except ImportError as e:
+        print(e)
+        pass
+
+    print(module.call_workflow(wf=Workflow3()))
     click.echo("test...todo")
 
 

entry_point.py renamed to afw_entry_point.py

@@ -2,11 +2,10 @@
 
 import sys
 
-from main import do_workflow
-
 # Workflow3 supports Alfred 3's new features. The `Workflow` class
 # is also compatible with Alfred 2.
 from ualfred import Workflow3
+from workflow_main import call_workflow
 
 
 def main(workflow):
@@ -26,7 +25,7 @@ def main(workflow):
     # args = wf.args
 
     # Do stuff here ...
-    feedback = do_workflow(workflow)
+    feedback = call_workflow(workflow)
 
     # Add an item to Alfred feedback
     # wf.add_item(u'Item title', u'Item subtitle')

afw_time_converter/__init__.py

@@ -0,0 +1 @@
+from .workflow_main import call_workflow

afw_time_converter/info.plist

@@ -60,7 +60,7 @@
 				<key>runningsubtext</key>
 				<string></string>
 				<key>script</key>
-				<string>python3 entry_point.py "{query}"</string>
+				<string>python3 afw_entry_point.py "{query}"</string>
 				<key>scriptargtype</key>
 				<integer>0</integer>
 				<key>scriptfile</key>

afw_time_converter/main.py renamed to afw_time_converter/workflow_main.py

@@ -203,7 +203,7 @@ def get_feedback(self):
         return f
 
 
-def do_workflow(wf):
+def call_workflow(wf):
     time = Time(wf)
     time.do_parser()