diff --git a/Flask/templates/vnc_post.html b/Flask/templates/vnc_post.html
index d168e33..3707a2a 100644
--- a/Flask/templates/vnc_post.html
+++ b/Flask/templates/vnc_post.html
@@ -9,7 +9,7 @@
{% else %}
diff --git a/V6.py b/V6.py
index 0ad1edb..32de9d9 100755
--- a/V6.py
+++ b/V6.py
@@ -867,57 +867,62 @@ def very_custom_start(json):
driver.close()
display.stop()
-if g.vnc_enabled or g.dev:
- display = SmartDisplay(backend="xvnc", size=(1920, 1080), rfbport=g.vnc_port, color_depth=24)
+
+if g.very_custom :
+ very_custom_start(dict(g.very_custom))
+
else :
- display = SmartDisplay(size=(1920, 1080))
-display.start()
+ if g.vnc_enabled or g.dev:
+ display = SmartDisplay(backend="xvnc", size=(1920, 1080), rfbport=g.vnc_port, color_depth=24)
+ else :
+ display = SmartDisplay(size=(1920, 1080))
+ display.start()
-#webhookFailure.send(f"Starting on this config", username="Check de lancement", avatar_url="https://cdn-icons-png.flaticon.com/512/1688/1688988.png")
+ #webhookFailure.send(f"Starting on this config", username="Check de lancement", avatar_url="https://cdn-icons-png.flaticon.com/512/1688/1688988.png")
-if g.dev :
- driver = firefox_driver()
- #input("kill ?")
- driver.quit()
-elif g.custom_start:
- CustomStart()
-elif g.unban:
- g._mail, g._password = select_accounts(False)[0]
- driver = firefox_driver()
- try :
- login(driver)
- except Banned:
- unban()
- driver.quit()
-else:
- if g.update_version != "None":
- if g.discord_enabled_error:
- webhookFailure.send(f"Updated to {g.update_version}", username="UPDATE", avatar_url="https://cdn-icons-png.flaticon.com/512/1688/1688988.png")
- for cred in g._cred:
- if cred[0] != "":
- g._mail = cred[0]
- g._password = cred[1]
- if cred[2] != '':
- g._otp = TOTP(cred[2])
- custom_sleep(1)
- printf("Début du driver.")
- driver = firefox_driver()
- printf("Driver demarré.")
- driver.implicitly_wait(3)
- try:
- daily_routine()
- driver.quit()
- attente = uniform(1200, 3600)
- printf(f"finis. attente de {round(attente/60)}min")
- custom_sleep(attente)
- except KeyboardInterrupt:
- printf("Canceled. Closing driver and display.")
- driver.quit()
- display.stop()
- break
- except Exception as e:
- log_error(f"Error not catched. Skipping this account. " + format_error(e), driver)
- printf(f"Error not catched. Skipping this account. {e}")
- driver.quit()
+ if g.dev :
+ driver = firefox_driver()
+ #input("kill ?")
+ driver.quit()
+ elif g.custom_start:
+ CustomStart()
+ elif g.unban:
+ g._mail, g._password = select_accounts(False)[0]
+ driver = firefox_driver()
+ try :
+ login(driver)
+ except Banned:
+ unban()
+ driver.quit()
+ else:
+ if g.update_version != "None":
+ if g.discord_enabled_error:
+ webhookFailure.send(f"Updated to {g.update_version}", username="UPDATE", avatar_url="https://cdn-icons-png.flaticon.com/512/1688/1688988.png")
+ for cred in g._cred:
+ if cred[0] != "":
+ g._mail = cred[0]
+ g._password = cred[1]
+ if cred[2] != '':
+ g._otp = TOTP(cred[2])
+ custom_sleep(1)
+ printf("Début du driver.")
+ driver = firefox_driver()
+ printf("Driver demarré.")
+ driver.implicitly_wait(3)
+ try:
+ daily_routine()
+ driver.quit()
+ attente = uniform(1200, 3600)
+ printf(f"finis. attente de {round(attente/60)}min")
+ custom_sleep(attente)
+ except KeyboardInterrupt:
+ printf("Canceled. Closing driver and display.")
+ driver.quit()
+ display.stop()
+ break
+ except Exception as e:
+ log_error(f"Error not catched. Skipping this account. " + format_error(e), driver)
+ printf(f"Error not catched. Skipping this account. {e}")
+ driver.quit()
-display.stop()
+ display.stop()
diff --git a/modules/config.py b/modules/config.py
index a508cf1..7a93db9 100644
--- a/modules/config.py
+++ b/modules/config.py
@@ -55,8 +55,7 @@ parser.add_argument(
"-v",
"--vnc",
help="enable VNC",
- dest="vnc",
- default="2345"
+ dest="vnc"
)
parser.add_argument(
@@ -116,7 +115,7 @@ g.discord_enabled_success = discord[discord_conf]["successT"] == "True"
g.avatar_url = settings["avatarlink"]
-if not very_custom :
+if not g.very_custom :
if g.discord_enabled_error:
webhookFailure = Webhook.from_url(g.discord_error_link, adapter=RequestsWebhookAdapter())
if g.discord_enabled_success:
diff --git a/modules/globals.py b/modules/globals.py
index cadf1c4..39a43f6 100644
--- a/modules/globals.py
+++ b/modules/globals.py
@@ -36,3 +36,4 @@ dev = False
norvege = False
database_error_override = False
fast = False
+very_custom=""
\ No newline at end of file
diff --git a/version b/version
index deea042..82a8346 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-v6.6.29
+v6.6.30