From a46f43a6cf26e68a180f0f589fa4c7fbec790534 Mon Sep 17 00:00:00 2001 From: evilhero Date: Sun, 16 Dec 2012 13:41:01 -0500 Subject: [PATCH] fix: not able to open up weekly comics tab, fix: removed some print statements displaying to console --- mylar/__init__.py | 2 +- mylar/webserve.py | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/mylar/__init__.py b/mylar/__init__.py index c8aa0565..a0f3448e 100755 --- a/mylar/__init__.py +++ b/mylar/__init__.py @@ -556,7 +556,7 @@ def dbcheck(): c.execute('CREATE TABLE IF NOT EXISTS snatched (IssueID TEXT, ComicName TEXT, Issue_Number TEXT, Size INTEGER, DateAdded TEXT, Status TEXT, FolderName TEXT, ComicID TEXT)') c.execute('CREATE TABLE IF NOT EXISTS upcoming (ComicName TEXT, IssueNumber TEXT, ComicID TEXT, IssueID TEXT, IssueDate TEXT, Status TEXT)') c.execute('CREATE TABLE IF NOT EXISTS nzblog (IssueID TEXT, NZBName TEXT)') - c.execute('CREATE TABLE IF NOT EXISTS weekly (SHIPDATE, PUBLISHER text, ISSUE text, COMIC VARCHAR(150), EXTRA text, STATUS text)') + #c.execute('CREATE TABLE IF NOT EXISTS weekly (SHIPDATE, PUBLISHER text, ISSUE text, COMIC VARCHAR(150), EXTRA text, STATUS text)') # c.execute('CREATE TABLE IF NOT EXISTS sablog (nzo_id TEXT, ComicName TEXT, ComicYEAR TEXT, ComicIssue TEXT, name TEXT, nzo_complete TEXT)') #new diff --git a/mylar/webserve.py b/mylar/webserve.py index 0de7232c..dc0f5d95 100755 --- a/mylar/webserve.py +++ b/mylar/webserve.py @@ -329,8 +329,9 @@ class WebInterface(object): if popit: weeklyresults = myDB.select("SELECT * from weekly") pulldate = myDB.action("SELECT * from weekly").fetchone() - #if pulldate is None: - # raise cherrypy.HTTPRedirect("home") + if pulldate is None: + return self.manualpull() + #raise cherrypy.HTTPRedirect("home") else: return self.manualpull() return serve_template(templatename="weeklypull.html", title="Weekly Pull", weeklyresults=weeklyresults, pulldate=pulldate['SHIPDATE'],pullfilter=False) @@ -601,7 +602,7 @@ class WebInterface(object): # Handle the variable config options. Note - keys with False values aren't getting passed mylar.EXTRA_NEWZNABS = [] - print ("here") + for kwarg in kwargs: if kwarg.startswith('newznab_host'): newznab_number = kwarg[12:] @@ -613,12 +614,12 @@ class WebInterface(object): newznab_enabled = 0 mylar.EXTRA_NEWZNABS.append((newznab_host, newznab_api, newznab_enabled)) - print ("there") + # Sanity checking if mylar.SEARCH_INTERVAL < 360: logger.info("Search interval too low. Resetting to 6 hour minimum") mylar.SEARCH_INTERVAL = 360 - print ("boo") + # Write the config mylar.config_write()