mirror of https://github.com/evilhero/mylar
FIX:(#2275) Experimental search was pointing to incorrect/old domain
This commit is contained in:
parent
7696edbc8b
commit
d280ce0b0b
|
@ -102,6 +102,7 @@ CONFIG = None
|
||||||
CONFIG_FILE = None
|
CONFIG_FILE = None
|
||||||
CV_HEADERS = None
|
CV_HEADERS = None
|
||||||
CVURL = None
|
CVURL = None
|
||||||
|
EXPURL = None
|
||||||
DEMURL = None
|
DEMURL = None
|
||||||
WWTURL = None
|
WWTURL = None
|
||||||
WWT_CF_COOKIEVALUE = None
|
WWT_CF_COOKIEVALUE = None
|
||||||
|
@ -166,7 +167,7 @@ def initialize(config_file):
|
||||||
|
|
||||||
global CONFIG, _INITIALIZED, QUIET, CONFIG_FILE, OS_DETECT, MAINTENANCE, CURRENT_VERSION, LATEST_VERSION, COMMITS_BEHIND, INSTALL_TYPE, IMPORTLOCK, PULLBYFILE, INKDROPS_32P, \
|
global CONFIG, _INITIALIZED, QUIET, CONFIG_FILE, OS_DETECT, MAINTENANCE, CURRENT_VERSION, LATEST_VERSION, COMMITS_BEHIND, INSTALL_TYPE, IMPORTLOCK, PULLBYFILE, INKDROPS_32P, \
|
||||||
DONATEBUTTON, CURRENT_WEEKNUMBER, CURRENT_YEAR, UMASK, USER_AGENT, SNATCHED_QUEUE, NZB_QUEUE, PP_QUEUE, SEARCH_QUEUE, DDL_QUEUE, PULLNEW, COMICSORT, WANTED_TAB_OFF, CV_HEADERS, \
|
DONATEBUTTON, CURRENT_WEEKNUMBER, CURRENT_YEAR, UMASK, USER_AGENT, SNATCHED_QUEUE, NZB_QUEUE, PP_QUEUE, SEARCH_QUEUE, DDL_QUEUE, PULLNEW, COMICSORT, WANTED_TAB_OFF, CV_HEADERS, \
|
||||||
IMPORTBUTTON, IMPORT_FILES, IMPORT_TOTALFILES, IMPORT_CID_COUNT, IMPORT_PARSED_COUNT, IMPORT_FAILURE_COUNT, CHECKENABLED, CVURL, DEMURL, WWTURL, WWT_CF_COOKIEVALUE, \
|
IMPORTBUTTON, IMPORT_FILES, IMPORT_TOTALFILES, IMPORT_CID_COUNT, IMPORT_PARSED_COUNT, IMPORT_FAILURE_COUNT, CHECKENABLED, CVURL, DEMURL, EXPURL, WWTURL, WWT_CF_COOKIEVALUE, \
|
||||||
DDLPOOL, NZBPOOL, SNPOOL, PPPOOL, SEARCHPOOL, \
|
DDLPOOL, NZBPOOL, SNPOOL, PPPOOL, SEARCHPOOL, \
|
||||||
USE_SABNZBD, USE_NZBGET, USE_BLACKHOLE, USE_RTORRENT, USE_UTORRENT, USE_QBITTORRENT, USE_DELUGE, USE_TRANSMISSION, USE_WATCHDIR, SAB_PARAMS, \
|
USE_SABNZBD, USE_NZBGET, USE_BLACKHOLE, USE_RTORRENT, USE_UTORRENT, USE_QBITTORRENT, USE_DELUGE, USE_TRANSMISSION, USE_WATCHDIR, SAB_PARAMS, \
|
||||||
PROG_DIR, DATA_DIR, CMTAGGER_PATH, DOWNLOAD_APIKEY, LOCAL_IP, STATIC_COMICRN_VERSION, STATIC_APC_VERSION, KEYS_32P, AUTHKEY_32P, FEED_32P, FEEDINFO_32P, \
|
PROG_DIR, DATA_DIR, CMTAGGER_PATH, DOWNLOAD_APIKEY, LOCAL_IP, STATIC_COMICRN_VERSION, STATIC_APC_VERSION, KEYS_32P, AUTHKEY_32P, FEED_32P, FEEDINFO_32P, \
|
||||||
|
@ -250,6 +251,9 @@ def initialize(config_file):
|
||||||
WWTURL = 'https://worldwidetorrents.to/'
|
WWTURL = 'https://worldwidetorrents.to/'
|
||||||
DEMURL = 'https://www.demonoid.pw/'
|
DEMURL = 'https://www.demonoid.pw/'
|
||||||
|
|
||||||
|
#set the default URL for nzbindex
|
||||||
|
EXPURL = 'https://nzbindex.nl/'
|
||||||
|
|
||||||
if CONFIG.LOCMOVE:
|
if CONFIG.LOCMOVE:
|
||||||
helpers.updateComicLocation()
|
helpers.updateComicLocation()
|
||||||
|
|
||||||
|
|
|
@ -98,10 +98,10 @@ def Startit(searchName, searchIssue, searchYear, ComicVersion, IssDateFix, bookt
|
||||||
if mylar.CONFIG.PREFERRED_QUALITY == 1: joinSearch = joinSearch + " .cbr"
|
if mylar.CONFIG.PREFERRED_QUALITY == 1: joinSearch = joinSearch + " .cbr"
|
||||||
elif mylar.CONFIG.PREFERRED_QUALITY == 2: joinSearch = joinSearch + " .cbz"
|
elif mylar.CONFIG.PREFERRED_QUALITY == 2: joinSearch = joinSearch + " .cbz"
|
||||||
|
|
||||||
feeds.append(feedparser.parse("http://beta.nzbindex.com/search/rss?q=%s&max=50&minage=0%s&hidespam=1&hidepassword=1&sort=agedesc%s&complete=0&hidecross=0&hasNFO=0&poster=&g[]=85" % (joinSearch, max_age, size_constraints)))
|
feeds.append(feedparser.parse(mylar.EXPURL + "search/rss?q=%s&max=50&minage=0%s&hidespam=1&hidepassword=1&sort=agedesc%s&complete=0&hidecross=0&hasNFO=0&poster=&g[]=85" % (joinSearch, max_age, size_constraints)))
|
||||||
time.sleep(5)
|
time.sleep(5)
|
||||||
if mylar.CONFIG.ALTEXPERIMENTAL:
|
if mylar.CONFIG.ALTEXPERIMENTAL:
|
||||||
feeds.append(feedparser.parse("http://beta.nzbindex.com/search/rss?q=%s&max=50&minage=0%s&hidespam=1&hidepassword=1&sort=agedesc%s&complete=0&hidecross=0&hasNFO=0&poster=&g[]=86" % (joinSearch, max_age, size_constraints)))
|
feeds.append(feedparser.parse(mylar.EXPURL + "search/rss?q=%s&max=50&minage=0%s&hidespam=1&hidepassword=1&sort=agedesc%s&complete=0&hidecross=0&hasNFO=0&poster=&g[]=86" % (joinSearch, max_age, size_constraints)))
|
||||||
time.sleep(5)
|
time.sleep(5)
|
||||||
i+=1
|
i+=1
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue