Simpler PS1

[dotfiles.git] / files / pc / tasks.py

diff --git a/files/pc/tasks.py b/files/pc/tasks.py
index 79fe3fa24c0368f50a2ff96a2f52166710f84e19..a15202b315aaed8410efbdec09b9a356bb6ee6a0 100644 (file)
--- a/files/pc/tasks.py
+++ b/files/pc/tasks.py
@@ -6,15 +6,23 @@ import os
 
 HOME = os.path.expanduser('~')
 TODAY = dt.now().strftime('%Y.%m.%d')
-KIDS_ALLOWANCE_URL=os.environ.get('KIDS_ALLOWANCE_URL')
 PAYROLL = os.environ.get('PAYROLL')
-BUDGET_URL = os.environ.get('BUDGET_URL')
-CU_URL = os.environ.get('CU_URL')
 SCHOOL = f"{HOME}/School"
-PAYROLL = f"{HOME}/Nanny.Payroll"
 
+expect_URLs = [
+'budget',
+'cu',
+'allowance'
+]
 
 
+URLS = {}
+for url in expect_URLs:
+    key = f'URL_{url.upper()}'
+    result = os.environ.get(key)
+    if not result:
+        raise ValueError(f'Missing expected {key} in environment.')
+    URLS[url] = result
 
 def browse(c, url):
     c.run(f"librefox {url}", asynchronous=True)
@@ -83,20 +91,24 @@ def debug(c):
 
 @task
 def allowance(c):
-    browse(c, KIDS_ALLOWANCE_URL)
+    browse(c, URLS['allowance'])
+
+@task
+def payroll_folders(c):
+    # For copying the latest file in
+    folder(c, f"{HOME}/pixel7adocuments")
+    folder(c, f"{PAYROLL}/data/payroll_inbox")
+    folder(c, f"{PAYROLL}")
 
 
 @task
 def payroll(c):
 
     allowance(c)
-
-    # For copying the latest file in
-    folder(c, f"{HOME}/pixel7adocuments")
-    folder(c, f"{PAYROLL}/data/payroll_inbox")
+    payroll_folders(c)
 
     # For editing files
-    folder_payroll(c)
+    code(c, f"{PAYROLL}")
     payroll_jupyter(c)
 
 @task
@@ -105,10 +117,6 @@ def payroll_jupyter(c):
     # For running the payroll scripts
     c.run(f"cd {PAYROLL};{HOME}/envs/jupyter/bin/jupyter-lab")
 
-@task
-def folder_payroll(c):
-    code(c, f"{PAYROLL}")
-
 
 @task()
 def screenshare(c):
@@ -144,8 +152,8 @@ def mod_luanti(c):
 
 @task
 def budget(c):
-    browse(c, BUDGET_URL)
-    browse(c, CU_URL)
+    browse(c, URLS['budget'])
+    browse(c, URLS['cu'])
 
 
 @task