Update sites/pixiv.py

sites/pixiv.py

@@ -44,9 +44,9 @@ def getOrderedPixivImages(driver,exec_path,user_search,num_pics,num_pages,search
         driver.get(link)
 
     # Will use those when not logged in
-    bar_search = '//input[@placeholder="Search works"]'
-    li_search = "//h3[contains(text(), 'Works') or contains(text(), 'Illustrations and Manga') or contains(text(), 'Illustrations')]/ancestor::section[1]/div[2]//li"
-    premium_search = "//h3[contains(text(), 'Popular works')]/ancestor::section[1]/div[2]//li"
+    bar_search = generate_xpath_query("//input", "@placeholder", "search works")
+    li_search = generate_xpath_query("//h3", "text()", "works", "illustrations and manga", "illustrations") + "/ancestor::section[1]/div[2]//li"
+    premium_search = generate_xpath_query("//h3", 'text()', 'popular works') + "/ancestor::section[1]/div[2]//li"
     search_param = {
         "bar_search": bar_search,
         "li_search": li_search,
@@ -55,19 +55,21 @@ def getOrderedPixivImages(driver,exec_path,user_search,num_pics,num_pages,search
 
     # Check if logged in otherwise log in with credentials
     try:
-        # Explicit wait to check for favorite button (only appears for logged in users)
-        WebDriverWait(driver, timeout=6).until(
-            EC.presence_of_element_located((By.XPATH, "//button[contains(text(), 'Add to your favorites')]")))
-        
-        if driver.find_elements(By.XPATH, "//button[contains(text(), 'Add to your favorites')]"):
+        # Check for favorite button (only appears for logged in users)
+        favorite_buttons = driver.find_elements(By.XPATH, case_insensitive_xpath_contains("//button", 'Add to your favorites'))
+
+        if favorite_buttons:
             success_login = True
+        elif user_name and pass_word:
+            print("Logging in...")
+            if login_handler(driver, exec_path, user_name, pass_word):
+                success_login = True
 
         if not success_login:
             print("Failed! You are not logged in...")
 
-    except:
-        print("Failed! You are not logged in...")
-        pass
+    except Exception as e:
+        print(f"Failed! You are not logged in... Exception: {e}")
     
     if 1 not in imageControl:
         searchQuery(user_search, driver, search_param["bar_search"], isLoggedIn=success_login)
@@ -87,7 +89,7 @@ def getOrderedPixivImages(driver,exec_path,user_search,num_pics,num_pages,search
     r_18 = 1 if 1 in viewRestriction else 0
     ultimatium = 1 if 0 in imageControl else 0
     order_by_oldest = 1 if 2 in imageControl else 0
-    ai_mode = 1 
+    ai_mode = 1 if 3 in imageControl else 0
 
     if not contains_works(driver, search_param["li_search"]):
         print("No works found...")
@@ -133,9 +135,9 @@ def getOrderedPixivImages(driver,exec_path,user_search,num_pics,num_pages,search
     # Click show all results
     try:
         time.sleep(1)
-        show_all_div = driver.find_element(By.XPATH, "//div[contains(text(), 'Show all')]")
+        show_all_div = driver.find_element(By.XPATH, case_insensitive_xpath_contains("//div", 'Show all'))
         if show_all_div:
-            driver.find_element(By.XPATH, '//*[@class="sc-d98f2c-0 sc-s46o24-1 dAXqaU"]').click()
+            show_all_div.click()
     except:
         pass
     
@@ -145,7 +147,7 @@ def getOrderedPixivImages(driver,exec_path,user_search,num_pics,num_pages,search
     if freemiumSearch:
         while len(image_locations) < num_pics*num_pages:
             search_image(driver,exec_path,filters,search_param=search_param,searchLimit=searchLimit)
-            if not valid_page(driver) and len(image_locations) < num_pics*num_pages:
+            if len(image_locations) < num_pics*num_pages and not valid_page(driver):
                 print("Reached end of search results")
                 break
     driver.quit()
@@ -169,7 +171,6 @@ def search_image(driver,exec_path,filters,search_param,searchLimit={"pagecount":
         images = search_image_type(search_type, driver, search_param=search_param)
 
         for image in images:
-            time.sleep(2)
             if len(image_locations) - prev_search >= searchLimit["imagecount"]*searchLimit["pagecount"] or len(image_locations) - temp_img_len >= searchLimit["imagecount"]:
                 break
             image = image.find_element(By.XPATH, "." + "/" + "/a")
@@ -241,7 +242,7 @@ def login_handler(driver, exec_path, user_name, pass_word):
     actions.click(user_btn[1]).send_keys(pass_word).perform()
 
     # Log in button
-    driver.find_element(By.XPATH,"//button[contains(text(), 'Log In')]").click()
+    driver.find_element(By.XPATH,"//button[contains(translate(text(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), 'log in')]").click()
 
     return True
 
@@ -392,3 +393,11 @@ def process_ai_mode(imageLink, image, driver, exec_path):
         os.remove(img_loc)
     except:
         return True
+    
+
+def case_insensitive_xpath_contains(xpath, text):
+    return f"{xpath}[contains(translate(text(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), '{text.lower()}')]"
+
+
+def generate_xpath_query(base_xpath, attribute, *args):
+    return base_xpath + "[" + " or ".join(f"translate({attribute}, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz') = '{arg.lower()}'" for arg in args) + "]"