fixed bug with curly braces in template. code cleanup

DFO-Ocean-Navigator · Jan 24, 2024 · f14a6e6 · f14a6e6
1 parent 6dfe6fb
commit f14a6e6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/plotting/scriptGenerator.py b/plotting/scriptGenerator.py
@@ -27,9 +27,9 @@ def generatePython(url: str, plot_type: str, script_Type: str) -> BytesIO:
         template = str(f.read())
 
         if script_Type == "plot":
-            template = template.format(q=query, p=plot_type, var=var, f=fname+' + ".png"')
+            template = template.format(q=query, p=plot_type, var=var, f=fname)
         elif script_Type == "csv":
-            template = template.format(q=query, p=plot_type, var=var, f=fname+' + ".csv"')
+            template = template.format(q=query, p=plot_type, var=var, f=fname)
         else:
             template = template.format(q=query, var=var, f=fname)
 

diff --git a/plotting/templates/python_csv_template.txt b/plotting/templates/python_csv_template.txt
@@ -28,7 +28,7 @@ def requestFile():
    dump = data_file.raw
    # change this if you want a different save location
    location = os.getcwd()
-   fname = {f}
+   fname = {f} + ".png"
    with open(fname, "wb") as location:
       print('Saving File')
       shutil.copyfileobj(dump, location)

diff --git a/plotting/templates/python_plot_template.txt b/plotting/templates/python_plot_template.txt
@@ -21,14 +21,14 @@ def requestFile():
 
    # Assemble full request
    base_url = "https://navigator.oceansdata.ca/api/v2.0/plot/{p}?"
-   url = base_url + urlencode({"query": json.dumps(query)}) + "&format=png&size=10x7&dpi=" + str(dpi)
+   url = base_url + urlencode({{"query": json.dumps(query)}}) + "&format=png&size=10x7&dpi=" + str(dpi)
    print(url)
 
 
    #Open URL and save response
    with closing(urlopen(url)) as f:
       img = Image.open(f)
-      fname = {f}
+      fname = {f} + ".png"
       print("Saving as " + fname + " and exiting...")
       img.save(fname , "PNG")