il commence a y avoir beaucoup de modifs

Flask/templates/vnc_post.html

@@ -9,7 +9,7 @@
 {% else %}
 <table>
     <tr>
-        <td width="20%" height="90%"><iframe id="iframe" src="{{url_for('static', filename='logs/dev.txt')}}" width="100%" height="100%"></iframe></td>
+        <td width="20%" height="90%"><iframe id="iframe" src="{{url_for('static', filename='logs/custom.txt')}}" width="100%" height="100%"></iframe></td>
         <td width="80%"><iframe src="/novnc/vnc.html?resize=scale&path=novnc/websockify&view_only" width="100%" height="100%" frameborder="0"></iframe></td>
     </tr>
 </table>

V6.py

@@ -867,21 +867,26 @@ 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 :
+    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()
+    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 :
+    if g.dev :
         driver = firefox_driver()
         #input("kill ?")
         driver.quit()
-elif g.custom_start:
+    elif g.custom_start:
         CustomStart()
-elif g.unban:
+    elif g.unban:
         g._mail, g._password  = select_accounts(False)[0]
         driver = firefox_driver()
         try : 
@@ -889,7 +894,7 @@ elif g.unban:
         except Banned:
             unban()
         driver.quit()
-else:
+    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")
@@ -920,4 +925,4 @@ else:
                     printf(f"Error not catched. Skipping this account. {e}")
                     driver.quit()
 
-display.stop()
+    display.stop()

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:

modules/globals.py

@@ -36,3 +36,4 @@ dev = False
 norvege = False
 database_error_override = False
 fast = False
+very_custom=""

version

@@ -1 +1 @@
-v6.6.29
+v6.6.30