some fixes here and there

.gitignore

@@ -12,3 +12,4 @@ data
 install.sh
 nohup.out
 test.py
+points.csv

V5.py

@@ -221,9 +221,10 @@ def all_cards(): # return to the main page and closes all other tabs
         if len(driver.window_handles) == 1:
             driver.get("https://www.bing.com/rewardsapp/flyout")
             if part2:
-                driver.find_element(
+                row_element = driver.find_elements(By.CSS_SELECTOR, f'[class="i-h rw-sh fp_row"]')[1]
-                    By.XPATH, "/html/body/div/div/div[3]/div[2]/div[2]/div[2]/div[1]"
+                expanded = row_element.get_attribute("aria-expanded")
-                ).click()
+                if expanded != "true":
+                    row_element.click()
         else:
             driver.switch_to.window(driver.window_handles[1])
             printf(f"fermeture : {driver.current_url}")
@@ -236,7 +237,7 @@ def all_cards(): # return to the main page and closes all other tabs
     def daily_cards(): # cartes de la premiere partie (renouvelées chaque jours).
         try:
             # make sure that the daily area is expanded
-            row_element = driver.find_element(By.XPATH, "/html/body/div/div/div[3]/div[2]/div[1]/div[1]")
+            row_element = driver.find_elements(By.CSS_SELECTOR, f'[class="i-h rw-sh fp_row"]')[0]
             expanded = row_element.get_attribute("aria-expanded")
             if expanded != "true":
                 row_element.click()
@@ -244,9 +245,8 @@ def all_cards(): # return to the main page and closes all other tabs
                 custom_sleep(uniform(3, 5))
                 try:
                     titre = "Placeholder"
-                    driver.find_element(
+                    elm = driver.find_elements(By.CLASS_NAME, 'promo_cont')
-                        By.XPATH,f"/html/body/div/div/div[3]/div[2]/div[1]/div[2]/div/div[{i+1}]/a",
+                    elm[i].click()
-                    ).click()
                     sleep(1)
                     titre = driver.title
                     try_play(titre)
@@ -255,7 +255,7 @@ def all_cards(): # return to the main page and closes all other tabs
                     printf(f"DailyCard {titre} ok")
                 except Exception as e:
                     log_error(f"all_cards card {titre} error ({format_error(e)})")
-
+                """
                 try : # devrait renvoyer vrai si la carte i est faite ou pas, a l'aide su symbole en haut a droite de la carte
                     elm = driver.find_element(By.XPATH, f"/html/body/div/div/div[3]/div[2]/div[1]/div[2]/div/div[{i+1}]/a/div/div[2]/div[1]/div[2]/div")
                     if not ("correctCircle" in elm.get_attribute("innerHTML")):
@@ -266,23 +266,25 @@ def all_cards(): # return to the main page and closes all other tabs
                 except Exception as e : 
                     printf(format_error(e) + "probablement ok - check card")
                  # if it fail, it's probably okay -> when all three card are done, the pannel fold
-
+                """
         except Exception as e:
             log_error(e)
     
     def weekly_cards():
         # make sure that the weekly area is expanded
-        row_element = driver.find_element(By.XPATH, "/html/body/div/div/div[3]/div[2]/div[2]/div[2]")
+        row_element = driver.find_elements(By.CSS_SELECTOR, f'[class="i-h rw-sh fp_row"]')[1]
         expanded = row_element.get_attribute("aria-expanded")
         if expanded != "true":
             row_element.click()
 
         for i in range(20): # Should raise an error whene there is no card left
             printf("début de l'une des cartes")
-            driver.find_element(
+            elm = driver.find_elements(By.CLASS_NAME, 'promo_cont')
-                By.XPATH,
+            try :
-                "/html/body/div/div/div[3]/div[2]/div[2]/div[3]/div/div[1]/a/div/div[2]",
+                elm[0].click()
-            ).click()
+            except Exception as e :
+                print(f"{e} + {driver.current_url}")
+                break
             driver.switch_to.window(driver.window_handles[len(driver.window_handles) - 1])
             sleep(1)
             titre = driver.title
@@ -290,13 +292,13 @@ def all_cards(): # return to the main page and closes all other tabs
             try_play(titre)
             reset(True)
             sleep(1)
-            try:
+            #try:
-                findall('href="([^<]+)" title=""', driver.page_source)[3]  # return error if there is no cards left to do
+            #    findall('href="([^<]+)" title=""', driver.page_source)[3]  # return error if there is no cards left to do
-            except:
+            #except:
-                break
+            #    break
 
     def top_cards():
-        for _ in range(10):
+        for _ in range(2):
             try :
                 driver.find_element(By.XPATH, "/html/body/div/div/div[3]/div[1]/div/div[1]/div[2]").click()
                 reset()
@@ -305,17 +307,20 @@ def all_cards(): # return to the main page and closes all other tabs
                 break
     
     try :
-        top_cards()
+        #top_cards()
+        print("top card not working really well right now. Disableing them")
     except Exception as e:
         log_error(e)
 
     try:
         daily_cards()
+        print("daily card")
     except Exception as e:
         log_error(e)
 
     try :
         weekly_cards()
+        print("weekly card")
     except Exception as e:
         log_error(e)
 
@@ -665,7 +670,6 @@ def fidelity():
             fidelity_link = fidelity_link_page.content.decode("UTF-8")
 
             if (fidelity_link.split(":")[0] == "https") or (fidelity_link.split(":")[0] == "http") : 
-                
                 driver.get(fidelity_link)
                 wait_until_visible(By.CSS_SELECTOR, 'div[class="pull-left spacer-48-bottom punchcard-row"]', browser=driver)
                 try : 
@@ -678,9 +682,10 @@ def fidelity():
                     answer_number = search("([0-9]) de ([0-9]) finalisé", driver.page_source)
                 if answer_number is None :
                     answer_number = search("([0-9]) licence\(s\) sur ([0-9]) disponible\(s\)", driver.page_source)
+                if answer_number is None :
+                    answer_number = search("([0-9])&nbsp;défi\(s\) terminé\(s\) sur ([0-9])", driver.page_source)
                 if answer_number is None :
                     answer_number = [0,0,0]
-
                 for _ in range(int(answer_number[2]) - int(answer_number[1])):
                     driver.refresh()
                     custom_sleep(2)

main.py

@@ -169,8 +169,10 @@ def check_update():
         print("Already up to date.")
     else :
         print(f"updating to {latest}")
+        os.system("git reset --hard")
         os.system("git pull")
-        print("updated")
+        os.system("python3 -m pip install -r requirements.txt > update.result")
+        print(f"updated to {latest}")
 
 
 LogPath = config["PATH"]["logpath"]

version

@@ -1 +1 @@
-v5.2.0
+v5.2.5