meh
This commit is contained in:
piair
parent
027ca5dbdb
commit
ca7f49e6a6
|
|
@ -388,4 +388,5 @@ def maxi(dict):
|
|||
|
||||
if __name__ == '__main__':
|
||||
update_jobs()
|
||||
edit_version()
|
||||
app.run(host='0.0.0.0', port=1234, debug=True)
|
||||
10
V6.py
10
V6.py
|
|
@ -27,15 +27,15 @@ def firefox_driver(mobile=False, headless=False):
|
|||
)
|
||||
chrome_options = webdriver.ChromeOptions()
|
||||
if mobile:
|
||||
chrome_options.add_argument(f"--user-agent={PC_USER_AGENT}")
|
||||
else :
|
||||
chrome_options.add_argument(f"--user-agent={MOBILE_USER_AGENT}")
|
||||
else :
|
||||
chrome_options.add_argument(f"--user-agent={PC_USER_AGENT}")
|
||||
# disabled as it may cause detection
|
||||
if g.proxy_enabled:
|
||||
PROXY = f"{g.proxy_address}:{g.proxy_port}" # IP:PORT or HOST:PORT
|
||||
chrome_options.add_argument(f'--proxy-server={PROXY}')
|
||||
driver = uc.Chrome(options=chrome_options)
|
||||
set_language()
|
||||
set_language(driver)
|
||||
return(driver)
|
||||
|
||||
|
||||
|
|
@ -825,9 +825,9 @@ def CustomStart():
|
|||
|
||||
|
||||
if g.vnc_enabled :
|
||||
display = SmartDisplay(backend="xvnc", size=(2160, 2160), rfbport=g.vnc_port, color_depth=24)
|
||||
display = SmartDisplay(backend="xvnc", size=(1920, 1080), rfbport=g.vnc_port, color_depth=24)
|
||||
else :
|
||||
display = SmartDisplay(size=(2160, 2160))
|
||||
display = SmartDisplay(size=(1920, 1080))
|
||||
display.start()
|
||||
|
||||
|
||||
|
|
|
|||
198
main.py
198
main.py
|
|
@ -1,198 +0,0 @@
|
|||
#/usr/bin/python3.10
|
||||
from packaging.version import parse as parse_version
|
||||
import configparser
|
||||
import os
|
||||
import shutil
|
||||
import requests
|
||||
import sys
|
||||
|
||||
|
||||
config = configparser.ConfigParser()
|
||||
|
||||
try :
|
||||
config_path = f"{os.path.abspath( os.path.dirname( __file__ ) )}/user_data/config.cfg"
|
||||
if config.read(config_path)==[] :
|
||||
raise NameError("le fichier n'existe pas")
|
||||
except :
|
||||
default_config = f"{os.path.abspath( os.path.dirname( __file__ ) )}/user_data/config.default"
|
||||
shutil.copyfile(default_config, config_path)
|
||||
config.read(config_path)
|
||||
|
||||
|
||||
def confirm(texte, default = False):
|
||||
if default :
|
||||
txt = '[Y/n]'
|
||||
else :
|
||||
txt = '[y/N]'
|
||||
|
||||
yes = ['y', 'yes', 'o', 'oui']
|
||||
no = ['n', 'non', 'no']
|
||||
a = input(f"{texte} {txt}").lower()
|
||||
if a in yes :
|
||||
return True
|
||||
elif a in no :
|
||||
return False
|
||||
return default
|
||||
|
||||
lang = "en"
|
||||
|
||||
text = {"fr" : {
|
||||
"compte" : "entrer l'adresse mail du compte ",
|
||||
"mdp" : "entrez le mot de passe du compte ",
|
||||
"next" : "voulez vous ajouter un compte ? ",
|
||||
"finc" : "comptes en cours d'ajout ",
|
||||
"ajout" : "comptes ajouté ",
|
||||
"fidelity" : "avez vous un lien sur lequel le lien vers la page fidélité du mois est le seul contenu de la page ? ",
|
||||
"lien" : "entrez le lien ",
|
||||
"discorde" : "voulez vous envoyer les erreurs sur discord ? ",
|
||||
"w1" : "entrez le lien du WebHook pour envoyer les points ",
|
||||
"w2" : "entrez le lien du WebHook pour envoyer les erreurs ",
|
||||
"msqle" : "voulez vous utiliser une base de donnée ",
|
||||
"msqll" : "entrez le lien de la base de donnée ",
|
||||
"msqlu" : "entrez l'utilisateur de la base de donnée ",
|
||||
"msqlp" : "entrez le mot de passe de la base de donnée ",
|
||||
"msqlt" : "entrez le nom de la table de la base de donnée ",
|
||||
"proxye" : "voulez vous utiliser un proxy ",
|
||||
"proxyl" : "entrez le lien du proxy ",
|
||||
"proxyp" : "entrez le port du proxy "
|
||||
},
|
||||
"en" : {
|
||||
"compte" : "enter email of an account",
|
||||
"mdp" : "enter password of this account ",
|
||||
"next" : "Add another account ? ",
|
||||
"finc" : "Adding accounts ",
|
||||
"ajout" : "Accounts added ",
|
||||
"discorde" : "Do you want to use discord ? (Highly recommended as it's untested without)",
|
||||
"w1" : "Enter Webhook link for sending points everyday",
|
||||
"w2" : "Enter Webhook link for errors ",
|
||||
"msqle" : "Do you want to use a database ? ",
|
||||
"msqll" : "database link ",
|
||||
"msqlu" : "database username ",
|
||||
"msqlp" : "database password ",
|
||||
"msqlt" : "database name (should be MsRewards) ",
|
||||
"proxye" : "Do you want to use a proxy ",
|
||||
"proxyl" : "Proxy address ",
|
||||
"proxyp" : "Proxy port "
|
||||
}
|
||||
}
|
||||
|
||||
t = text[lang]
|
||||
|
||||
def setup():
|
||||
setup_comptes()
|
||||
setup_settings()
|
||||
|
||||
|
||||
def setup_comptes():
|
||||
lc = []
|
||||
compte = input(t["compte"])
|
||||
mdp = input(t["mdp"])
|
||||
lc.append(f"{compte},{mdp}")
|
||||
for i in range(5):
|
||||
if confirm(t["next"], default = True):
|
||||
compte = input(t["compte"])
|
||||
mdp = input(t["mdp"])
|
||||
lc.append(f"{compte},{mdp}")
|
||||
else:
|
||||
print(t["finc"])
|
||||
break
|
||||
f = open('./user_data/login.csv', "w")
|
||||
for i in lc :
|
||||
f.write(i)
|
||||
f.write("\n")
|
||||
f.close()
|
||||
print(t["ajout"])
|
||||
edit_config_txt("logpath",f'{os.getcwd()}/user_data/login.csv')
|
||||
|
||||
|
||||
def edit_config_txt(ligne, contenu):
|
||||
f = open(config_path, "r")
|
||||
txt = f.readlines()
|
||||
f.close()
|
||||
if txt.count(txt) >1:
|
||||
raise NameError("Fail")
|
||||
|
||||
for i in range(len(txt)) :
|
||||
name = txt[i].split(" = ")[0]
|
||||
if name == ligne:
|
||||
txt[i] = name + " = " + str(contenu) + "\n"
|
||||
|
||||
f = open(config_path, "w")
|
||||
for i in txt :
|
||||
f.write(i)
|
||||
f.close()
|
||||
|
||||
|
||||
def setup_settings():
|
||||
discord()
|
||||
proxy()
|
||||
sql()
|
||||
|
||||
|
||||
|
||||
|
||||
def discord():
|
||||
enabled = confirm(t["discorde"], default = True)
|
||||
if enabled :
|
||||
edit_config_txt("DiscordErrorEnabled", True)
|
||||
|
||||
edit_config_txt('DiscordSuccessEnabled', confirm("send success ?", default = True))
|
||||
w1 = input(t["w1"])
|
||||
edit_config_txt("successlink",w1)
|
||||
w2 = input(t["w2"])
|
||||
edit_config_txt("errorlink",w2)
|
||||
|
||||
|
||||
def sql() :
|
||||
enabled = confirm(t["msqle"], default = False)
|
||||
if enabled :
|
||||
edit_config_txt("sql_enabled", True)
|
||||
lien = input(t["msqll"])
|
||||
edit_config_txt("host",lien)
|
||||
table = input(t["msqlt"])
|
||||
edit_config_txt("database",table)
|
||||
user = input(t["msqlu"])
|
||||
edit_config_txt("usr",user)
|
||||
pwd = input(t["msqlp"])
|
||||
edit_config_txt("pwd",pwd)
|
||||
|
||||
|
||||
def proxy() :
|
||||
enabled = confirm(t["proxye"], default = False)
|
||||
if enabled :
|
||||
edit_config_txt("proxy_enabled", True)
|
||||
lien = input(t["proxyl"])
|
||||
edit_config_txt("url",lien)
|
||||
port = input(t["proxyp"])
|
||||
edit_config_txt("port",port)
|
||||
|
||||
|
||||
def check_update(args):
|
||||
try :
|
||||
latest = requests.get("https://api.github.com/repos/piair338/MsRewards/releases").json()[0]["tag_name"]
|
||||
latest = parse_version(latest)
|
||||
except Exception as e :
|
||||
print(e)
|
||||
return (args)
|
||||
f = open("./version", 'r')
|
||||
txt = f.readlines()[0].replace("\n","")
|
||||
f.close()
|
||||
cur = parse_version(txt)
|
||||
if not (cur < latest) :
|
||||
print("Already up to date.")
|
||||
return(args)
|
||||
else :
|
||||
print(f"updating to {latest}")
|
||||
os.system("git reset --hard")
|
||||
os.system("git pull")
|
||||
os.system("python3 -m pip install -r requirements.txt > update.result")
|
||||
print(f"updated to {latest}")
|
||||
return(args + f" --version {latest}")
|
||||
|
||||
LogPath = config["PATH"]["logpath"]
|
||||
if LogPath == "/your/path/to/loginandpass.csv" :
|
||||
setup()
|
||||
else :
|
||||
args = " ".join(sys.argv[1::])
|
||||
args = check_update(args)
|
||||
os.system("python3 V5.py " + args)
|
||||
Loading…
Reference in New Issue