OS-agnotic changes

Add OS-agnostic code to derive path to CSV file.
espanso · Dec 13, 2024 · 3714943 · 3714943
1 parent 946675f
commit 3714943
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/packages/form-list/0.2.0/README.md b/packages/form-list/0.2.0/README.md
@@ -10,10 +10,10 @@ You will need to edit the entries in the `form_urls.csv`. The sample lines are a
 | --- | --- |
 | gmail | https://gmail.com/ |
 
-**Separate the two fields with a comma.** Remember to save the file!
+**Separate the two fields with a comma.** Remember to save the file! Ensure you retain its UTF-8 encoding. Some spreadsheet programs will switch to UTF-8-BOM.
 
 ## Reuse
 
 You can of course also copy the contents of this package and create multiple form lists with other text. 👍 If you do so, you will need to edit the global variable for the location of the csv file.
 
-Requires Python, but if present should work in all OSs.
+Requires Python, but if present should work in all operating systems.
diff --git a/packages/form-list/0.2.0/package.yml b/packages/form-list/0.2.0/package.yml
@@ -1,15 +1,23 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/espanso/espanso/dev/schemas/match.schema.json
 
 global_vars:
+  # OS-agnostic derivation of path to CSV file.
   - name: urlcsv
-    type: shell
+    type: script
     params:
-      cmd: echo "$CONFIG/match/packages/form-list/0.2.0/form_urls.csv"
-
+      args:
+        - python
+        - -c
+        - |
+          import os
+          config_path = os.getenv("CONFIG")
+          print(os.path.join(config_path, "match", "packages", "form-list", "0.2.0", "form_urls.csv"))
+      
 matches:
   - trigger: :forms
     replace: '{{form_url}}'
     vars:
+      # Read choice-list options from CVS file.
       - name: form_names
         type: script
         params:
@@ -18,7 +26,7 @@ matches:
             - -c
             - |
               import csv
-              with open('{{urlcsv}}', newline='') as f:
+              with open(r'{{urlcsv}}', newline='') as f:
                 for row in csv.reader(f): print(row[0])
       - name: choice
         type: form
@@ -30,6 +38,7 @@ matches:
             choices:
               type: list
               values: '{{form_names}}'
+      # Return paired item as selected above
       - name: form_url
         type: script
         params:
@@ -38,7 +47,7 @@ matches:
             - -c
             - |
               import csv
-              with open('{{urlcsv}}', newline='') as f:
+              with open(r'{{urlcsv}}', newline='') as f:
                 for row in csv.reader(f):
                   if row[0] == '{{choice.choices}}':
                     print(row[1])