Merge pull request #11 from augustin64/patch-2

This commit is contained in:
piair338 2022-11-16 18:15:27 +01:00 committed by GitHub
commit ca0ae8917a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 58 additions and 28 deletions

18
V4.py
View File

@ -1,6 +1,6 @@
#!/usr/bin/python3.10
import asyncio
from csv import reader
import csv
from os import sys, system, path
from random import choice, randint, shuffle, uniform
from re import findall, search
@ -907,7 +907,19 @@ def unban2():
except Banned :
unban()
except NotBanned :
printf("you are not cureently banned on this account")
printf("you are not currently banned on this account")
def SavePointsFromFile(file):
with open(file) as f:
reader = csv.reader(f)
points_list = list(reader)
for item in points_list:
compte, points = item[0], item[1]
add_to_database(compte, points, sql_host,sql_usr,sql_pwd,sql_database, save_if_fail=False)
with open(file, "w") as f:
f.write("")
def StartTask(task):
@ -939,6 +951,8 @@ if CUSTOM_START:
CustomStart(Credentials)
elif UNBAN:
unban2()
elif POINTS_FILE != "":
SavePointsFromFile(POINTS_FILE)
else:
with Progress(

View File

@ -64,6 +64,14 @@ parser.add_argument(
type=argparse.FileType('r')
)
parser.add_argument(
"-a",
"--add-points",
help="Add points to the database from a file and exit",
dest="points_file",
default=""
)
args = parser.parse_args()
CUSTOM_START = args.override
UNBAN = args.unban
@ -73,7 +81,9 @@ FAST = args.fast
if CUSTOM_START :
LOG = True
# gloabal variables used later in the code
POINTS_FILE = args.points_file
# global variables used later in the code
LINUX_HOST = platform == "linux" # if the computer running this programm is linux, it allow more things
START_TIME = time()
driver = None

View File

@ -32,7 +32,8 @@ def get_row(compte, points, mycursor, same_points = True): #return if there is a
return(len(myresult) == 1)
def add_to_database(compte, points, sql_host,sql_usr,sql_pwd,sql_database ):
def add_to_database(compte, points, sql_host,sql_usr,sql_pwd,sql_database, save_if_fail=True):
try:
mydb = mysql.connector.connect(
host=sql_host,
user=sql_usr,
@ -57,5 +58,10 @@ def add_to_database(compte, points, sql_host,sql_usr,sql_pwd,sql_database ):
mycursor.close()
mydb.close()
except BaseException as e:
if save_if_fail:
print("\nLes points n'ont pas pu être ajoutés, enregistrement dans le fichier 'points.csv'\n")
with open("points.csv", "a") as file:
file.write(f"{compte},{points}\n")
raise e