AppSettings.py added, has room to progress

fixed Vless regex pattern

Author: aryanesmaili

.gitignore

@@ -1,2 +1,6 @@
 Credentials.json
 Paths.json
+main.spec
+tst.py
+build/
+dist/

.idea/Pythonv2raystuff.iml

@@ -0,0 +1,58 @@
+import json
+import os
+
+
+class UserInfo:
+    def __init__(self, apikey, email, zoneid, save_dest, ippath):
+        self.Save_Destination = save_dest
+        self.ZoneID = zoneid
+        self.IPPath = ippath
+        self.EmailAddress = email
+        self.apikey = apikey
+
+
+class AppSettings:
+    def __init__(self):
+        self.locations = {
+            "Credentials": os.path.join(os.getcwd(), "Credentials.json"),
+            "Paths": os.path.join(os.getcwd(), "Paths.json")
+        }
+
+    def change_ips_location(self, new_ip_location: str):
+        with open(self.locations['Paths'], "r+") as f:
+            file = json.load(f)
+        file['IPPath'] = new_ip_location.replace("'", "").replace('"', '')
+
+        # Write the updated JSON data back to the file
+        with open(self.locations['Paths'], 'w') as f:
+            json.dump(file, f)
+
+    def change_save_location(self, new_save_location):
+        with open(self.locations['Paths']) as f:
+            file = json.load(f)
+        file['SaveLocation'] = new_save_location.replace("'", "").replace('"', '')
+
+        # Write the updated JSON data back to the file
+        with open(self.locations['Paths'], 'w') as f:
+            json.dump(file, f)
+
+    def change_credentials(self, credential: int, new_value: str):
+        with open(self.locations['Credentials'], "r+") as f:
+            file = json.load(f)
+        if credential == 1:
+            file['apikey'] = new_value
+        elif credential == 2:
+            file['EmailAddress'] = new_value
+        elif credential == 3:
+            file['ZoneID'] = new_value
+        with open(self.locations['Credentials'], "w") as f:
+            json.dump(file, f)
+
+    def show_user_info(self):
+        with open(self.locations["Credentials"], "r") as f:
+            credentials = json.load(f)
+        with open(self.locations["Paths"], "r") as f:
+            paths = json.load(f)
+
+        return UserInfo(credentials['apikey'], credentials['EmailAddress'], credentials['ZoneID']
+                        , paths['SaveLocation'], paths['IPPath'])

.idea/workspace.xml

@@ -14,7 +14,8 @@ class ConfigUpdater:
     def __init__(self, ips_location: str, save_location: str):
         self.IPlocation = ips_location
         self.SaveLocation = save_location
-        self.vless_pattern = r'^(vless://)?([\w-]+)@([\d.]+):(\d+)\?([^#]*)#(.*)$'
+        self.vless_pattern = (r'vless://(?P<user_id>[^@]+)@(?P<address>[^:]+):(?P<port>\d+)\?(?P<parameters>[^#]+)#('
+                              r'?P<config_name>[^#]+)')
 
     @staticmethod
     def split_the_ips(list_of_ips: list) -> list:
@@ -31,24 +32,31 @@ def update_vmess_config(config: dict, ip: str) -> dict:
         return config_copy
 
     def update_vless_config(self, config: Config, new_ip: str) -> str:
-        match = re.search(self.vless_pattern, config.link)
+        match = re.match(self.vless_pattern, config.link)
         if match:
-            prefix = match.group(1) if match.group(1) else ''
-            username = match.group(2)
-            port = match.group(4)
-            fragment_identifier = match.group(6)
+            user_id = match.group('user_id')
+            # address = match.group('address')
+            port = match.group('port')
+            parameters = match.group('parameters')
+            config_name = match.group('config_name')
 
-            new_config = f'{prefix}{username}@{new_ip}:{port}?{fragment_identifier}'
+            new_config = f'vless://{user_id}@{new_ip}:{port}?{parameters}#{config_name}'
             return new_config
         else:
             raise ValueError("Invalid VLESS URL format")
 
     def write_config_to_disk(self, config: Config, encoded_configs: list):
-        output_file = os.path.join(self.SaveLocation, f"{config.configtype.capitalize()}final.txt")
+        # Construct the file path
+        output_file = os.path.join(self.SaveLocation, f"{config.configtype.capitalize()}final.txt").replace("\\", "/")
+
+        # Ensure the directory exists, including any necessary parent directories
+        os.makedirs(os.path.dirname(output_file), exist_ok=True)
+
         # Write the updated configurations to the respective output file
         with open(output_file, 'w') as f:
-            for config in encoded_configs:
-                f.write(config + '\n')
+            for config_line in encoded_configs:
+                f.write(config_line + '\n')
+
         print(f"Updated configurations saved to {output_file}")
         return True
 
@@ -68,13 +76,10 @@ def update_config(self, configstr: str):
                 for updated_config in updated_configs]
 
         elif config.configtype == "vless":
-            query_and_fragment = config.link.split('?', 1)[1]
             updated_configs = [self.update_vless_config(config, ip) for ip in ips]
 
             # Check if the prefix is already present and add it accordingly
-            encoded_configs = [
-                f'{updated_config}?{query_and_fragment}' if updated_config.startswith('vless://') else
-                f'vless://{updated_config}?{query_and_fragment}' for updated_config in updated_configs]
+            encoded_configs = [f'{updated_config}' for updated_config in updated_configs]
 
         else:
             raise ValueError("Value Not Assessed")

AppSettings.py

@@ -1,6 +1,7 @@
 import json
 from cloudflare import CloudflareDNSManager
 from ConfigUpdater import ConfigUpdater
+from AppSettings import AppSettings
 import os
 
 
@@ -21,22 +22,22 @@ def get_ip_path(ip_file_path):
     path_to_ips = input("Where is the IP file? Enter full directory \n   e.g:D:/IPs/IPList.txt\n ").strip()
     print("You can change This Address in Paths.json")
     content = {
-        "IPPath": path_to_ips
+        "IPPath": path_to_ips.replace("'", "").replace('"', '')
     }
     with open(ip_file_path, "w") as file:
         json.dump(content, file)
     return path_to_ips
 
 
-def get_save_location(file_path):
+def get_save_location(save_file_path):
     path_to_save = input("Where do you want the Results to be saved at?Enter full Directory\n   e.g:D:/IPs\n ").strip()
     print("You can change This Address in Paths.json")
-    with open(file_path, "r+") as file:
+    with open(save_file_path, "r+") as file:
         content = json.load(file)
     if not os.path.exists(path_to_save):
         os.mkdir(path_to_save)
-    content["SaveLocation"] = path_to_save
-    with open(file_path, "w") as file:
+    content["SaveLocation"] = path_to_save.replace("'", "").replace('"', '')
+    with open(save_file_path, "w") as file:
         json.dump(content, file)
     return path_to_save
 
@@ -50,9 +51,12 @@ def split_the_i_ps(listofip):
 
 
 processDone = False
-
+wehavedata = (os.path.isfile(os.path.join(os.getcwd(), 'Credentials.json')) and
+              os.path.isfile(os.path.join(os.getcwd(), 'Paths.json')))
 while not processDone:
-    choice = input("What do you intend to do? \n    1_ Update V2ray Config\n    2_ Change Cloudflare DNS Record IP\n"
+    choice = input(f"What do you want to do? \n    1_ Update V2ray Config\n    2_ Change Cloudflare DNS Record IP\n" +
+                   f"{'    3_ Manage Settings' if wehavedata else ''}\n"
+                   +
                    "    Enter Here: ").strip()
 
     if choice == "1":
@@ -69,7 +73,6 @@ def split_the_i_ps(listofip):
         config = input("Please Enter Your Vmess/Vless Config:\n ").strip()
         configUpdater = ConfigUpdater(ips, destination_path)
         configUpdater.update_config(config)
-        processDone = True
 
     elif choice == "2":
         cf_manager = CloudflareDNSManager()
@@ -78,4 +81,9 @@ def split_the_i_ps(listofip):
         cf_manager.display_dns_records()
         cf_manager.choose_dns_record()
         cf_manager.change_dns_record_ip()
-        processDone = True
+
+    elif choice == "3":
+        settings = AppSettings()
+
+    else:
+        print("Please Enter Valid Input")