Refactored code for search and changed imports on login and launcher

launcher.py

@@ -1,6 +1,10 @@
 import os                   # TODO: change the order of all import statements to 1. standard library
-from login import *         # TODO: 2. related 3rd party
-from actions import *       # TODO: 3. local application. with blank lines between and remove wilcard symbols
+from login import login         # TODO: 2. related 3rd party
+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
 
 def user_choice():

login.py

@@ -64,5 +64,4 @@ def login():
             print("token is good")
         else:
             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

search.py

@@ -26,9 +26,6 @@ def searchRemainder(imageType, saveNameList, idNum):#Finds any images missing fr
         minNum = min(numbers)
         maxNum = max(numbers)
         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
     start, end = numbers[0], numbers[-1]
@@ -73,7 +70,11 @@ def search():
                 if checkTimestamp(saveTime, curTime) == False:
                     print("Your token has expired. Get a new one by choosing Refresh Token.")
                     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
     POS_KEY_TYPE = "?keyType=poster"
     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("poster", poster, idNum)
     downloadImages("banner", banner, idNum)
-                    return None
-    except:
-        print("There was an error checking your login. Try logging in again with 'Login/Change login'.")
+    print("All downloads finished!")
     return None