Merge remote-tracking branch 'origin/master'
# Conflicts: # scraper.py # scrapinglib/api.py
This commit is contained in:
@@ -64,10 +64,11 @@ def get_data_from_json(file_number, oCC, specified_source, specified_url):
|
||||
if conf.cacert_file():
|
||||
ca_cert = conf.cacert_file()
|
||||
|
||||
json_data = search(file_number, sources, proxies=proxies, verify=ca_cert,
|
||||
dbsite=javdb_site, dbcookies=javdb_cookies,
|
||||
morestoryline=conf.is_storyline(),
|
||||
specifiedSource=specified_source, specifiedUrl=specified_url)
|
||||
json_data = search(file_number, sources, proxies=proxies, verify=cacert,
|
||||
dbsite=javdb_site, dbcookies=javdb_cookies,
|
||||
morestoryline=conf.is_storyline(),
|
||||
specifiedSource=specified_source, specifiedUrl=specified_url,
|
||||
debug = conf.debug())
|
||||
# Return if data not found in all sources
|
||||
if not json_data:
|
||||
print('[-]Movie Number not found!')
|
||||
|
||||
Reference in New Issue
Block a user