ClaytonWWilson/Scraper-for-theTVDB.com
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/Scraper-for-theTVDB.com.git synced 2025-12-18 10:18:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored code for search and changed imports on login and launcher

Browse Source
This commit is contained in:
Clayton Wilson 2017-11-06 13:30:45 -05:00
parent da958cce55
commit ec12a6da1e
3 changed files with 71 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
launcher.py
View File

@ -1,6 +1,10 @@
import os # TODO: change the order of all import statements to 1. standard library import os # TODO: change the order of all import statements to 1. standard library
from login import * # TODO: 2. related 3rd party from login import login # TODO: 2. related 3rd party
from actions import * # TODO: 3. local application. with blank lines between and remove wilcard symbols from actions import wait # TODO: 3. local application. with blank lines between and remove wilcard symbols
from actions import clear_screen
from actions import clearLogin
from actions import refreshToken
from actions import update
from search import search from search import search
def user_choice(): def user_choice():

1
login.py
View File

@ -64,5 +64,4 @@ def login():
print("token is good") print("token is good")
else: else:
refreshToken() refreshToken()
# TODO try to get token, if token fails, ask for login info again, if it passes save login details to login.py and save token with timestamp.
# TODO at startup, check token for validity and remove it if it is expired # TODO at startup, check token for validity and remove it if it is expired

13
search.py
View File

@ -26,9 +26,6 @@ def searchRemainder(imageType, saveNameList, idNum):#Finds any images missing fr
minNum = min(numbers) minNum = min(numbers)
maxNum = max(numbers) maxNum = max(numbers)
tryMissing(missingList, minNum, maxNum, idNum, imageType) tryMissing(missingList, minNum, maxNum, idNum, imageType)
# print("min: %d" % int(min(numbers)))
# print("max: %d" % int(max(numbers)))
# quit()
def findMissing(numbers): # TODO test this def findMissing(numbers): # TODO test this
start, end = numbers[0], numbers[-1] start, end = numbers[0], numbers[-1]
@ -73,7 +70,11 @@ def search():
if checkTimestamp(saveTime, curTime) == False: if checkTimestamp(saveTime, curTime) == False:
print("Your token has expired. Get a new one by choosing Refresh Token.") print("Your token has expired. Get a new one by choosing Refresh Token.")
return None return None
else: # All login checks pass and search starts # TODO move everything below out of the try except except:
print("There was an error checking your login. Try logging in again with 'Login/Change login'.")
return None
# All login checks pass and search starts
FAN_KEY_TYPE = "?keyType=fanart" # These are used in the search strings FAN_KEY_TYPE = "?keyType=fanart" # These are used in the search strings
POS_KEY_TYPE = "?keyType=poster" POS_KEY_TYPE = "?keyType=poster"
BAN_KEY_TYPE = "?keyType=series" BAN_KEY_TYPE = "?keyType=series"
@ -135,7 +136,5 @@ def search():
downloadImages("fanart", fanart, idNum) # TODO find a better way to pass these variables. Constructor? downloadImages("fanart", fanart, idNum) # TODO find a better way to pass these variables. Constructor?
downloadImages("poster", poster, idNum) downloadImages("poster", poster, idNum)
downloadImages("banner", banner, idNum) downloadImages("banner", banner, idNum)
return None print("All downloads finished!")
except:
print("There was an error checking your login. Try logging in again with 'Login/Change login'.")
return None return None