markup: improve path routines

markup/spreadsheet.py

@@ -4,7 +4,7 @@ from itertools import zip_longest
 from openpyxl import Workbook
 from openpyxl.styles import PatternFill, Border, Side, Alignment, Protection, Font
 
-from .utils import ensure_dir, set_file_perms, WORKDIR
+from .utils import ensure_dir, set_file_perms
 
 
 def format_season(s):
@@ -19,7 +19,7 @@ def format_name(name, gender):
     return '{}-{}'.format(name, gender[:1])
 
 
-def write_spreadsheet(matches, workdir, file_base):
+def write_spreadsheet(matches, xls_path):
     if not matches:
         print('write_spreadsheet: no matches.  skipping.')
         return None
@@ -78,9 +78,5 @@ def write_spreadsheet(matches, workdir, file_base):
             cell.border = border
 
     # save
-    ensure_dir(workdir)
-    path = os.path.join(workdir, f"{file_base}.xlsx")
-    wb.save(path)
-    set_file_perms(path)
-
-    return path
+    wb.save(xls_path)
+    set_file_perms(xls_path)