works now

Author: Hörmet Yiltiz

lisp_eval/__init__.py

@@ -7,100 +7,134 @@
 
 from albert import *
 
-md_iid = '2.3'
-md_version = "1.6"
+md_iid = "2.3"
+md_version = "1.0"
 md_name = "S-Exp Eval"
-md_description = "Evaluate S-Expression via Fennel or Emacs"
+md_description = "Evaluate S-Expression via Fennel, Emacs, Janet, Racket or Hylang."
 md_license = "BSD-3"
-md_url = "https://github.com/albertlauncher/python/tree/main/fennel_eval"
-md_authors = "@manuelschneid3r"
+md_url = "https://github.com/albertlauncher/python/tree/main/lisp_eval/"
+md_authors = "@hyiltiz"
 
-class Plugin(PluginInstance, TriggerQueryHandler):
 
+class Plugin(PluginInstance, TriggerQueryHandler):
     def __init__(self):
         # search for a language supporting S-Exp: fennel, janet, elisp, clojure, racket
         # TODO: this should be a configurable option
         # Users should make available the executables in the system PATH
         lang_opts = {
-            'janet': {
-                'prog': 'janet',
-                'args': ['-e', '(print {})'],
-                'url': 'https://janet-lang.org/assets/janet-big.png'
+            "elisp": {
+                "prog": "emacs",
+                "args": ["--batch", "--eval", "(print {})"],
+                "url": "emacs-small.png",
+            },
+            "elisp": {
+                "prog": "Emacs",
+                "args": ["--batch", "--eval", "(print {})"],
+                "url": "emacs-small.png",
+            },
+            "fennel": {
+                "prog": "fennel",
+                "args": ["-e", "(print {})"],
+                "url": "fennel.svg",
             },
-            'fennel': {
-                'prog': 'fennel',
-                'args': ['-e', '(print {})'],
-                'url': 'https://janet-lang.org/assets/janet-big.png'
+            "janet": {
+                "prog": "janet",
+                "args": ["-e", "(print {})"],
+                "url": "janet.png",
             },
-            'elisp': {
-                'prog': 'emacs',
-                'args': ['--batch', '--eval', '(print {})'],
-                'url': 'https://www.gnu.org/software/emacs/images/emacs.png'
+            "hylang": {
+                "prog": "hy", # this is a pip3 dependency: `hy`
+                "args": ["-c", "(print {})"],
+                "url": "cuddles.png",
             },
-            'racket': {
-                'prog': 'racket',
-                'args': ['-e', '(print {})'],
-                'url': 'https://racket-lang.org/img/racket-logo.svg'
+            "racket": {
+                "prog": "racket",
+                "args": ["-e", "(print {})"],
+                "url": "racket.svg",
             },
         }
         self.lang_opts = lang_opts
 
-        test_sexp = '(+ 1 1)'
+        test_sexp = "(+ 1 1)"
         detected_langs = []
         for lang, args in lang_opts.items():
-            script = args['args'][-1].format(test_sexp)
+            script = args["args"][-1].format(test_sexp)
+            print(f"Testing {lang} with test script {script}")
             try:
-                proc = subprocess.run([args['prog'], *args['args'][0:-1], script], input=script.encode(),
-                                      stdout=subprocess.PIPE)
+                proc = subprocess.run(
+                    [args["prog"], *args["args"][0:-1], script],
+                    input=script.encode(),
+                    stdout=subprocess.PIPE,
+                )
                 result = proc.stdout.strip()
                 if result:
                     detected_langs.append(lang)
+                    break  # TODO: unless we provide alternatives in drop-down menu, do not bother detecting the rest
             except FileNotFoundError as ex:
-                # TODO: does Albert has a logger?
+                warning(str(ex))
                 continue
 
-
         PluginInstance.__init__(self)
-        TriggerQueryHandler.__init__(
-            self, self.id, self.name, self.description,
-            synopsis='<Evaluate Lisp S-Expression>',
-            defaultTrigger='() '
-        )
         self.detected_langs = detected_langs
         self.call_external = lang_opts[detected_langs[0]]
-        self.iconUrls = self.call_external['url']
+        self.iconUrls = [f"file:{Path(__file__).parent}/{self.call_external['url']}"]
+        TriggerQueryHandler.__init__(
+            self,
+            self.id,
+            self.name,
+            self.description,
+            synopsis=f"<Evaluate S-Expression using {detected_langs[0]}",
+            defaultTrigger="() ",
+        )
 
-    def handleTriggerQuery(self, query):
-        act = lambda script: (
-            lambda: runDetachedProcess([
-                self.call_external['prog'],
-                *self.call_external['args'][0:-1],
-                self.call_external['args'][-1].format(script)]
+    def runSubprocess(self, query_script):
+        try:
+            script = self.call_external["args"][-1].format(query_script)
+            proc = subprocess.run(
+                [
+                    self.call_external["prog"],
+                    *self.call_external["args"][0:-1],
+                    script,
+                ],
+                input=script.encode(),
+                stdout=subprocess.PIPE,
+                stderr=subprocess.PIPE,
+                capture_output=False,
+                check=False,
             )
-        )
+            print(f'---------- :runSubprocess: ----------------------------------------------------')
+            print(f'stderr: {proc.stderr}, returncode: {proc.returncode}, type: {type(proc.stderr)}')
+            print(f'stdout: {proc.stdout}, type: {type(proc.stdout)}')
+            print('\n\n')
+            result = proc.stderr.decode('utf-8', errors='replace').strip() + proc.stdout.decode('utf-8', errors='replace').strip()
+        except Exception as ex:
+            print(f'Python Subprocess call exception: {str(ex)}')
+            result = str(ex)
+        return result
 
+    def handleTriggerQuery(self, query):
         stripped = query.string.strip()
         if stripped:
             try:
-                result = act(stripped)
-
+                result = self.runSubprocess(stripped)
             except Exception as ex:
                 result = ex
 
-            result_str = str(result)
-
-            query.add(StandardItem(
-                id=self.id,
-                text=result_str,
-                subtext=type(result).__name__,
-                inputActionText=query.trigger + result_str,
-                iconUrls=self.iconUrls,
-                actions = [
-                    Action("copy", "Copy result to clipboard", lambda r=result_str: setClipboardText(r)),
-                    Action("exec", "Evaluate S-Expression", lambda r=result_str: act(r)),
-                ]
-            ))
+            result_str = result
 
-# if __name__ == '__main__':
-#     plugin = Plugin()
-#     plugin.run()
+            query.add(
+                StandardItem(
+                    id=self.id,
+                    text=result_str,
+                    subtext=stripped,
+                    inputActionText=self.call_external["prog"] + ": " + result_str,
+                    iconUrls=self.iconUrls,
+                    actions=[
+                        Action(
+                            "copy",
+                            "Copy result to clipboard",
+                            lambda r=result_str: setClipboardText(r),
+                        ),
+                    ],
+                )
+            )