From a2cb562fe652f52eca51ceb397104e8929a6b9ba Mon Sep 17 00:00:00 2001
From: Mirei <42766108+mahdibland@users.noreply.github.com>
Date: Sat, 1 Oct 2022 15:50:18 +0330
Subject: [PATCH] Update eternity_convert.py

---
 utils/eternity_convert.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/utils/eternity_convert.py b/utils/eternity_convert.py
index 72a8cc5f4..e829cf970 100644
--- a/utils/eternity_convert.py
+++ b/utils/eternity_convert.py
@@ -21,6 +21,15 @@ class NoAliasDumper(yaml.SafeDumper): # https://ttl255.com/yaml-anchors-and-alia
     def ignore_aliases(self, data):
         return True
 
+    
+def substrings(string, left, right):
+  value = string.replace('\n','').replace(' ', '')
+  start = value.index(left)
+  end = value.index(right)
+  final_value = value[start:end].replace(left, '')
+  return final_value
+
+
 def eternity_convert(file, config, output, provider_file_enabled=True):
     
     file_eternity = open(file, 'r', encoding='utf-8')
@@ -43,11 +52,9 @@ def eternity_convert(file, config, output, provider_file_enabled=True):
     for line in lines:
         if line != 'proxies:':
             #####
-            print(line)
-            line_json = json.loads(line.replace('\n', '').replace('- ', ''))
-            server_name = line_json["name"]
-            server_type = line_json["type"]
-            log_lines[indexx] = "name: %s | type: %s | %s" % (server_name, server_type, line)
+            server_name = substrings(line, "name:", ",server")
+            server_type = substrings(line, "type:", ",uuid")
+            log_lines[indexx] = "name: %s | type: %s | %s" % (server_name, server_type, log_lines[indexx])
             indexx += 1
             #####
             line = '  ' + line