mirror of https://github.com/evilhero/mylar
FIX: Added global reference so can change WWT URL in one location in __init__, FIX: Changed WWT to new domain, FIX: Removed DEM from being used
This commit is contained in:
evilhero
parent
aadb1a7d9e
commit
851799f642
|
|
@ -773,7 +773,7 @@
|
|||
<div class="row checkbox left clearfix">
|
||||
<input id="enable_public" title="Use Public Torrents" type="checkbox" name="enable_public" value=1 ${config['enable_public']} /><label>Enable Public Torrent Search</label>
|
||||
<div align="left">
|
||||
<small class="heading"><span style="float: left; margin-left: .3em; margin-top: 4px;" class="ui-icon ui-icon-info"></span>Search: WWT / RSS: DEM & WWT</small>
|
||||
<small class="heading"><span style="float: left; margin-left: .3em; margin-top: 4px;" class="ui-icon ui-icon-info"></span>Search: WWT / RSS: WWT</small>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row checkbox left clearfix">
|
||||
|
|
|
|||
|
|
@ -243,7 +243,7 @@ def initialize(config_file):
|
|||
CVURL = 'https://comicvine.gamespot.com/api/'
|
||||
|
||||
#set default URL for Public trackers (just in case it changes more frequently)
|
||||
WWTURL = 'https://worldwidetorrents.me/'
|
||||
WWTURL = 'https://worldwidetorrents.to/'
|
||||
DEMURL = 'https://www.demonoid.pw/'
|
||||
|
||||
if CONFIG.LOCMOVE:
|
||||
|
|
@ -488,7 +488,7 @@ def dbcheck():
|
|||
except sqlite3.OperationalError:
|
||||
logger.warn('Unable to update readinglist table to new storyarc table format.')
|
||||
|
||||
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, NewPublish TEXT, LatestIssue TEXT, LatestDate TEXT, Description TEXT, QUALalt_vers TEXT, QUALtype TEXT, QUALscanner TEXT, QUALquality TEXT, LastUpdated TEXT, AlternateSearch TEXT, UseFuzzy TEXT, ComicVersion TEXT, SortOrder INTEGER, DetailURL TEXT, ForceContinuing INTEGER, ComicName_Filesafe TEXT, AlternateFileName TEXT, ComicImageURL TEXT, ComicImageALTURL TEXT, DynamicComicName TEXT, AllowPacks TEXT, Type TEXT, Corrected_SeriesYear TEXT, TorrentID_32P TEXT, LatestIssueID 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, NewPublish TEXT, LatestIssue TEXT, LatestDate TEXT, Description TEXT, QUALalt_vers TEXT, QUALtype TEXT, QUALscanner TEXT, QUALquality TEXT, LastUpdated TEXT, AlternateSearch TEXT, UseFuzzy TEXT, ComicVersion TEXT, SortOrder INTEGER, DetailURL TEXT, ForceContinuing INTEGER, ComicName_Filesafe TEXT, AlternateFileName TEXT, ComicImageURL TEXT, ComicImageALTURL TEXT, DynamicComicName TEXT, AllowPacks TEXT, Type TEXT, Corrected_SeriesYear TEXT, Corrected_Type TEXT, TorrentID_32P TEXT, LatestIssueID 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 TEXT, ArtworkURL Text, ReleaseDate TEXT, Location TEXT, IssueDate TEXT, DigitalDate TEXT, Int_IssueNumber INT, ComicSize TEXT, AltIssueNumber TEXT, IssueDate_Edit TEXT, ImageURL TEXT, ImageURL_ALT 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, Provider TEXT, Hash TEXT, crc TEXT)')
|
||||
c.execute('CREATE TABLE IF NOT EXISTS upcoming (ComicName TEXT, IssueNumber TEXT, ComicID TEXT, IssueID TEXT, IssueDate TEXT, Status TEXT, DisplayComicName TEXT)')
|
||||
|
|
@ -610,6 +610,11 @@ def dbcheck():
|
|||
except sqlite3.OperationalError:
|
||||
c.execute('ALTER TABLE comics ADD COLUMN Corrected_SeriesYear TEXT')
|
||||
|
||||
try:
|
||||
c.execute('SELECT Corrected_Type from comics')
|
||||
except sqlite3.OperationalError:
|
||||
c.execute('ALTER TABLE comics ADD COLUMN Corrected_Type TEXT')
|
||||
|
||||
try:
|
||||
c.execute('SELECT TorrentID_32P from comics')
|
||||
except sqlite3.OperationalError:
|
||||
|
|
|
|||
|
|
@ -53,9 +53,12 @@ def torrents(pickfeed=None, seriesname=None, issue=None, feedinfo=None):
|
|||
# pickfeed = '2'
|
||||
# loopit = 1
|
||||
loopit = 1
|
||||
|
||||
if pickfeed == 'Public':
|
||||
#we need to cycle through both DEM + WWT feeds
|
||||
loopit = 2
|
||||
pickfeed = '999'
|
||||
# since DEM is dead, just remove the loop entirely
|
||||
# #we need to cycle through both DEM + WWT feeds
|
||||
# loopit = 2
|
||||
|
||||
lp = 0
|
||||
totalcount = 0
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ from mylar import logger, helpers
|
|||
class wwt(object):
|
||||
|
||||
def __init__(self, name, issue):
|
||||
self.url = 'https://worldwidetorrents.me/'
|
||||
self.url = mylar.WWTURL
|
||||
self.query = name + ' ' + str(int(issue)) #'Batman White Knight'
|
||||
logger.info('query set to : %s' % self.query)
|
||||
pass
|
||||
|
|
|
|||
Loading…
Reference in New Issue