From 6768e0e9505f7724beb173237f0b13592a665be2 Mon Sep 17 00:00:00 2001
From: evilhero <evilhero@gmail.com>
Date: Wed, 20 Jul 2016 15:43:16 -0400
Subject: [PATCH] FIX:(#1321) Pull list download button creates 500 Internal
 Server Error, FIX:(#1323) Add One-Off generates 500 Internal Server Error

---
 data/interfaces/default/weeklypull.html |  2 +-
 mylar/webserve.py                       | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/data/interfaces/default/weeklypull.html b/data/interfaces/default/weeklypull.html
index 5ad2982d..81ba9e3c 100755
--- a/data/interfaces/default/weeklypull.html
+++ b/data/interfaces/default/weeklypull.html
@@ -42,7 +42,7 @@
                        <input type="checkbox" name="weekfolder" id="weekfolder" value="1" ${checked(mylar.WEEKFOLDER)} /><label>Store in Weekly Directory (${weekfold})</label> 
                  </div>
 
-               <input type="hidden" name="pulldate" value=${weekinfo}>
+               <input type="hidden" name="pulldate" value="${weekinfo}">
                <input type="submit" style="display:none" />
              </fieldset>
           </form>
diff --git a/mylar/webserve.py b/mylar/webserve.py
index e445b98d..2c9baa8a 100755
--- a/mylar/webserve.py
+++ b/mylar/webserve.py
@@ -1285,7 +1285,7 @@ class WebInterface(object):
             if Publisher == 'COMICS': Publisher = None
             if ComicYear == '': ComicYear = now.year
             logger.info(u"Marking " + ComicName + " " + ComicIssue + " as wanted...")
-            foundcom, prov = search.search_init(ComicName=ComicName, IssueNumber=ComicIssue, ComicYear=ComicYear, SeriesYear=None, Publisher=Publisher, IssueDate=cyear['SHIPDATE'], StoreDate=cyear['SHIPDATE'], IssueID=None, AlternateSearch=None, UseFuzzy=None, ComicVersion=None,allowpacks=False)
+            foundcom, prov = search.search_init(ComicName=ComicName, IssueNumber=ComicIssue, ComicYear=ComicYear, SeriesYear=None, Publisher=Publisher, IssueDate=cyear['SHIPDATE'], StoreDate=cyear['SHIPDATE'], IssueID=None, AlternateSearch=None, UseFuzzy=None, ComicVersion=None, allow_packs=False)
             if foundcom  == "yes":
                 logger.info(u"Downloaded " + ComicName + " " + ComicIssue)
             raise cherrypy.HTTPRedirect("pullist")
@@ -3069,7 +3069,12 @@ class WebInterface(object):
                 dstdir = mylar.WEEKFOLDER_LOC
             else:
                 dstdir = mylar.DESTINATION_DIR
-            desdir = os.path.join(dstdir, str( str(pulldate['year']) + '-' + str(pulldate['weeknumber']) ))
+            import ast
+            pulldate = ast.literal_eval(pulldate)
+            logger.info('pulldate: ' + str(pulldate))
+            yr = pulldate['year']
+            wk = pulldate['weeknumber']
+            desdir = os.path.join(dstdir, str(yr) + '-' + str(wk))
             if os.path.isdir(desdir):
                 logger.info(u"Directory (" + desdir + ") already exists! Continuing...")
             else:
@@ -3085,7 +3090,7 @@ class WebInterface(object):
         else:
             desdir = mylar.GRABBAG_DIR
 
-        clist = myDB.select("SELECT * FROM Weekly AND weeknumber=? WHERE Status='Downloaded'", [pulldate['weeknumber']])
+        clist = myDB.select("SELECT * FROM weekly WHERE weeknumber=? AND Status='Downloaded'", [pulldate['weeknumber']])
         if clist is None:   # nothing on the list, just go go gone
             logger.info("There aren't any issues downloaded from this week yet.")
         else: