From 7298c82cebfbd1ebac9b46cbcc4d8bb26450b764 Mon Sep 17 00:00:00 2001 From: Clayton Wilson Date: Fri, 10 May 2019 21:34:55 -0400 Subject: [PATCH] Refactoring - Removing old code. --- main.py | 101 ------------------------------------------------------ search.py | 14 +------- 2 files changed, 1 insertion(+), 114 deletions(-) diff --git a/main.py b/main.py index 878ae6b..477dfd7 100644 --- a/main.py +++ b/main.py @@ -151,107 +151,6 @@ def download(series): f.write(image_res.content) counter+=1 - - - -def searchImages(id_num, keyType, authHeaders): # This is getting a list of file info for images in json format - query_url = "https://api.thetvdb.com/series/{}/images/query{}".format(str(id_num), keyType) - response = requests.get(query_url, headers=authHeaders) - if (checkStatus(response, True)): - return response - else: - quit() - -def downloadImages(image_type, respObj, id_num): # TODO some images arent grabbed through the api. save the image number and make a try catch to get any missing images - parse_resp_obj = json.loads(respObj.content) - - save_name_list = download(image_type, parse_resp_obj) - - searchRemainder(image_type, save_name_list, id_num) - -def searchRemainder(image_type, save_name_list, id_num):#Finds any images missing from the api call in getImages - numbers = [] - print("Checking for missing images...") # TODO implement this method - if (image_type is "banner"): # TODO check upper and lower bounds - print("this is a banner") - #TODO deal with banners - else: - for name in save_name_list: - if (name.rfind("-") != -1): - hyphen_index = name.rfind("-") - hyphen_suffix = name[hyphen_index + 1:] - file_num = hyphen_suffix.replace(".jpg", "") - numbers.append(int(file_num)) - else: - print("I couldn't find a hyphen in: {}".format(name)) # Error checking - numbers.sort - missing_list = findMissing(numbers) - min_num = min(numbers) - max_num = max(numbers) - - tryMissing(missing_list, min_num, max_num, id_num, image_type) - -def findMissing(numbers): - start, end = numbers[0], numbers[-1] - return sorted(set(range(start, end + 1)).difference(numbers)) - -def tryMissing(missing_nums, min_num, max_num, id_num, image_type): - if (image_type is "fanart"): - start_directory = "fanart/original/" - elif (image_type is "poster"): - start_directory = "posters/" - - for num in missing_nums: - filename = "{}{}-{}.jpg".format(start_directory, str(id_num), str(num)) - # filename = "%s%s-%d.jpg" % start_directory, id_num, missing_nums[num] - # try: - print("Trying... {}".format(filename)) - dl_url = "https://www.thetvdb.com/banners/{}".format(filename) - # print("url is: " + dl_url) - response = requests.get(dl_url) - # print(response.status_code) - if (checkStatus(response, True) == True): # TODO there is an error occurring here when checking fanart - path = os.path.join("{}\\{}-{}.jpg".format(image_type, str(id_num), str(num))) - obj = open(path, "wb") - obj.write(response.content) - obj.close() - print("Image found\n") - else: - print("Image not found\n") - # print(response.status_code) - - # except Exception as e: - # print("response code: " + str(response.status_code)) - # print("Check: " + dl_url) - # print(e) - - # while min_num > 1: # Checking lower bounds - # print("check lower") - -# def download(image_type, parse_resp_obj): -# counter = 0 -# save_name_list = [] -# for image_obj in parse_resp_obj["data"]: -# filename = parse_resp_obj["data"][counter]["filename"] # TODO the download method should start here, move everything else up to downloadImages -# counter = counter + 1 - -# slash_index = filename.rfind("/") # This is used to slice the url at the beginning of the filename -# save_name = filename[slash_index + 1:] # For example 'https://thetvdb.com/banners/fanart/original/32451-3.jpg' --> '32451.jpg' -# save_name_list.append(save_name) - -# print("Downloading... {}".format(filename)) -# dl_url = "https://www.thetvdb.com/banners/{}".format(filename) -# response = requests.get(dl_url) # TODO getting errors when checking 'new game'. Check to see if those images actually exist - -# if (checkStatus(response, True)): -# path = os.path.join(image_type + "\\", save_name) -# obj = open(path, "wb") -# obj.write(response.content) -# obj.close() -# else: -# quit() -# return save_name_list - def installReqs(): if is_pip_installed() == True: with open("requirements.txt") as f: diff --git a/search.py b/search.py index 23a80fd..6c36091 100644 --- a/search.py +++ b/search.py @@ -97,16 +97,4 @@ def search(): print() series = Series(create_file_name(search_results["data"][title]["seriesName"]), search_results["data"][title]["id"], "https://www.thetvdb.com/series/" + search_results["data"][title]["slug"]) - return series - - # id_num = search_results["data"][title]["id"] # Setting up the request urls - # fanart = searchImages(id_num, FAN_KEY_TYPE, authHeaders) # for banners, fanart, and posters - # poster = searchImages(id_num, POS_KEY_TYPE, authHeaders) - # banner = searchImages(id_num, BAN_KEY_TYPE, authHeaders) - - # clearFolders() - # downloadImages("fanart", fanart, id_num) # TODO find a better way to pass these variables. Constructor? - # downloadImages("poster", poster, id_num) - # downloadImages("banner", banner, id_num) - # print("\nAll downloads finished!\n") - # return None + return series \ No newline at end of file