From 6854500a6e9ee11fe1c52a7e592906a45a994c55 Mon Sep 17 00:00:00 2001 From: evilhero Date: Sun, 7 Oct 2012 12:20:06 -0400 Subject: [PATCH] Operational fix for Force Update - added Last Updated to detail page --- data/interfaces/default/artistredone.html | 9 ++++++++ mylar/__init__.py | 25 ++++++++++++++++++++++- mylar/importer.py | 3 ++- mylar/updater.py | 4 ++-- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/data/interfaces/default/artistredone.html b/data/interfaces/default/artistredone.html index 0373c5f5..7ccd927f 100755 --- a/data/interfaces/default/artistredone.html +++ b/data/interfaces/default/artistredone.html @@ -77,6 +77,15 @@
+
+ +
diff --git a/mylar/__init__.py b/mylar/__init__.py index a9982c98..e216fbb4 100755 --- a/mylar/__init__.py +++ b/mylar/__init__.py @@ -512,13 +512,36 @@ def dbcheck(): conn=sqlite3.connect(DB_FILE) c=conn.cursor() - c.execute('CREATE TABLE IF NOT EXISTS comics (ComicID TEXT UNIQUE, ComicName TEXT, ComicSortName TEXT, ComicYear TEXT, DateAdded TEXT, Status TEXT, IncludeExtras INTEGER, Have INTEGER, Total INTEGER, ComicImage TEXT, ComicPublisher TEXT, ComicLocation TEXT, ComicPublished TEXT, LatestIssue TEXT, LatestDate TEXT, Description TEXT, QUALalt_vers TEXT, QUALtype TEXT, QUALscanner TEXT, QUALquality TEXT)') + c.execute('CREATE TABLE IF NOT EXISTS comics (ComicID TEXT UNIQUE, ComicName TEXT, ComicSortName TEXT, ComicYear TEXT, DateAdded TEXT, Status TEXT, IncludeExtras INTEGER, Have INTEGER, Total INTEGER, ComicImage TEXT, ComicPublisher TEXT, ComicLocation TEXT, ComicPublished TEXT, LatestIssue TEXT, LatestDate TEXT, Description TEXT, QUALalt_vers TEXT, QUALtype TEXT, QUALscanner TEXT, QUALquality TEXT, LastUpdated TEXT)') c.execute('CREATE TABLE IF NOT EXISTS issues (IssueID TEXT, ComicName TEXT, IssueName TEXT, Issue_Number TEXT, DateAdded TEXT, Status TEXT, Type TEXT, ComicID, ArtworkURL Text, ReleaseDate TEXT, Location TEXT, IssueDate TEXT, Int_IssueNumber INT)') c.execute('CREATE TABLE IF NOT EXISTS sablog (nzo_id TEXT, ComicName TEXT, ComicYEAR TEXT, ComicIssue TEXT, name TEXT, nzo_complete TEXT)') 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 weekly (SHIPDATE, PUBLISHER text, ISSUE text, COMIC VARCHAR(150), EXTRA text, STATUS text)') + #add in the late players to the game.... + try: + c.execute('SELECT LastUpdated from comics') + except sqlite3.OperationalError: + c.execute('ALTER TABLE comics ADD COLUMN LastUpdated TEXT') + + try: + c.execute('SELECT QUALalt_vers from comics') + except sqlite3.OperationalError: + c.execute('ALTER TABLE comics ADD COLUMN QUALalt_vers TEXT') + try: + c.execute('SELECT QUALtype from comics') + except sqlite3.OperationalError: + c.execute('ALTER TABLE comics ADD COLUMN QUALtype TEXT') + try: + c.execute('SELECT QUALscanner from comics') + except sqlite3.OperationalError: + c.execute('ALTER TABLE comics ADD COLUMN QUALscanner TEXT') + try: + c.execute('SELECT QUALquality from comics') + except sqlite3.OperationalError: + c.execute('ALTER TABLE comics ADD COLUMN QUALquality TEXT') + conn.commit() c.close() diff --git a/mylar/importer.py b/mylar/importer.py index d961b54d..d6b65afc 100755 --- a/mylar/importer.py +++ b/mylar/importer.py @@ -269,7 +269,8 @@ def addComictoDB(comicid): controlValueStat = {"ComicID": comicid} newValueStat = {"Status": "Active", "LatestIssue": latestiss, - "LatestDate": latestdate + "LatestDate": latestdate, + "LastUpdated": helpers.now() } myDB.upsert("comics", newValueStat, controlValueStat) diff --git a/mylar/updater.py b/mylar/updater.py index cd746e1d..40a2c134 100755 --- a/mylar/updater.py +++ b/mylar/updater.py @@ -28,12 +28,12 @@ def dbUpdate(): activecomics = myDB.select('SELECT ComicID, ComicName from comics WHERE Status="Active" or Status="Loading" order by LastUpdated ASC') - logger.info('Starting update for %i active comics' % len(activecomicss)) + logger.info('Starting update for %i active comics' % len(activecomics)) for comic in activecomics: comicid = comic[0] - importer.addComictoDB(comicid) + mylar.importer.addComictoDB(comicid) logger.info('Update complete')