diff --git a/Flask/templates/settings.html b/Flask/templates/settings.html index 67dd293..d0a2379 100644 --- a/Flask/templates/settings.html +++ b/Flask/templates/settings.html @@ -52,17 +52,14 @@ - - - TODO - - - - - - - -
reorder config
real override
ban button
database truc
pourquoi tout ne se lance pas bien ?
logs viewer
+

Backup config files

diff --git a/V6.py b/V6.py index 47b627a..084defc 100755 --- a/V6.py +++ b/V6.py @@ -160,7 +160,6 @@ def play_quiz8(): except Exception as e: log_error(f"{format_error(e)} \n Good answers : {' '.join(correct_answers)}") - printf("play_quiz8 : fin ") custom_sleep(3) @@ -189,7 +188,6 @@ def play_quiz4(override=None): except Exception as e: log_error(e) raise ValueError(e) - printf("play_quiz4 : end") custom_sleep(3) @@ -206,7 +204,6 @@ def do_poll(): except Exception as error: log_error(error) raise ValueError(error) - printf("do_poll : end") custom_sleep(3) @@ -567,6 +564,7 @@ def log_points(account="unknown"): driver.get("https://rewards.bing.com") custom_sleep(1) if "/proofs/" in driver.current_url: + webhookFailure.send(f"Is /proof Useful in logpoints?", username="Dev tests", avatar_url="https://cdn.discordapp.com/attachments/793934298977009677/1144560898879541268/image.png") for id in ["KmsiCheckboxField","iLooksGood", "idSIButton9", "iCancel"]: try: driver.find_element(By.ID, id).click() @@ -592,7 +590,7 @@ def log_points(account="unknown"): custom_sleep(300) log_error(e) points = None - + if not points : log_error(f"impossible d'avoir les points") @@ -609,11 +607,10 @@ def log_points(account="unknown"): else: webhookSuccess.send(f"{account_name} actuellement à {str(points)} points") - if g.sql_enabled : - try : - add_to_database(account_name, points) - except Exception as e: - log_error(e) + try : + add_to_database(account_name, points) + except Exception as e: + log_error(e) def fidelity(): diff --git a/modules/config.py b/modules/config.py index abc4432..5a847b0 100644 --- a/modules/config.py +++ b/modules/config.py @@ -63,8 +63,7 @@ with open("/app/MsRewards-Reborn/user_data/proxy.json", "r") as inFile: proxy = json.load(inFile) with open("/app/MsRewards-Reborn/user_data/configs.json", "r") as inFile: config = json.load(inFile) -with open("/app/MsRewards-Reborn/user_data/database.json", "r") as inFile: - database = json.load(inFile) + args = parser.parse_args() @@ -114,19 +113,6 @@ if g.proxy_enabled : g.proxy_address = proxy[config[args.config]["proxy"]]["address"] g.proxy_port = proxy[config[args.config]["proxy"]]["port"] -# MySQL settings - -g.sql_enabled = database["checked"] == "checked" -g.sql_usr = database["usr"] -g.sql_pwd = database["pwd"] -g.sql_host = database["host"] -g.sql_database = database["table"] - - -try : - g.database_error_override = config["OTHER"]["database_override"] == "True" -except : - pass g.fast = False diff --git a/modules/db.py b/modules/db.py index 3cd1c8d..063f8c0 100644 --- a/modules/db.py +++ b/modules/db.py @@ -1,7 +1,6 @@ import sqlite3 #Create a new row, for the account [compte] whith [points] points -#SQLITE def add_row(compte, points, mycursor, mydb): sql = "INSERT INTO daily (compte, points, date) VALUES (?, ?, date())" val = (compte, points) @@ -11,7 +10,6 @@ def add_row(compte, points, mycursor, mydb): #update the ammount of points for the account [compte] -#SQLITE def update_row(compte, points, mycursor, mydb): sql = f"UPDATE daily SET points = {points} WHERE compte = '{compte}' AND date = date() ;" mycursor.execute(sql) diff --git a/user_data/database.json b/user_data/database.json deleted file mode 100644 index 9e26dfe..0000000 --- a/user_data/database.json +++ /dev/null @@ -1 +0,0 @@ -{} \ No newline at end of file