abstract-utilities 0.2.2.471__py3-none-any.whl → 0.2.2.473__py3-none-any.whl

abstract_utilities/robust_readers/import_utils/clean_imports.py

@@ -5,6 +5,12 @@ from ...list_utils import make_list
 import os
 import_tag = 'import '
 from_tag = 'from '
+def get_text_or_read(text=None,file_path=None):
+    text = text or ''
+    imports_js = {}
+    if file_path and os.path.isfile(file_path):
+        text+=read_from_file(file_path)
+    return text
 def is_line_import(line):
     if line and (line.startswith(from_tag) or line.startswith(import_tag)):
         return True
@@ -65,17 +71,32 @@ def get_cleaned_import_list(line,commaClean=True):
         imports = line.split(import_tag)[1]
         cleaned_import_list+=clean_imports(imports,commaClean=commaClean)
     return cleaned_import_list
-def clean_imports(text=None,file_path=None,write=False):
-    text = text or ''
-    imports_js = {}
-    if file_path and os.path.isfile(file_path):
-        text+=read_from_file(file_path)
+def get_all_imports(text=None,file_path=None,import_pkg_js=None):
+    text = get_text_or_read(text=text,file_path=file_path)
     lines = text.split('\n')
     cleaned_import_list=[]
     nu_lines = []
-    j=None
     is_from_group = False
-    import_pkg_js={"nulines":[],"file_path":file_path}
+    import_pkg_js = import_pkg_js or {}
+    if "nulines" not in import_pkg_js:
+        import_pkg_js["nulines"]=[]
+    if "file_path" not in import_pkg_js:
+        import_pkg_js["file_path"]=file_path
+    if "all_data" not in import_pkg_js:
+        import_pkg_js["all_data"]=[]
+    if file_path and file_path != import_pkg_js["file_path"]:
+        found=False
+        nu_data = {"file_path":import_pkg_js["file_path"],"nulines":import_pkg_js["nulines"]}
+        for i,data in enumerate(import_pkg_js["all_data"]):
+            if data.get('file_path') == import_pkg_js["file_path"]:
+                import_pkg_js["all_data"][i] = nu_data
+                found = True
+                break
+        if found == False:
+            import_pkg_js["all_data"].append(nu_data)
+        import_pkg_js["nulines"]=[]
+        import_pkg_js["file_path"]=file_path
+    import_pkg_js={}
     for line in lines:
         if line.startswith(import_tag) and ' from ' not in line:
             cleaned_import_list = get_cleaned_import_list(line)
@@ -93,12 +114,15 @@ def clean_imports(text=None,file_path=None,write=False):
             else:
                 import_pkg_js=update_import_pkg_js(line,import_pkg_js=import_pkg_js)
             if is_from_line_group(line) and is_from_group == False:
-                
                 is_from_group=get_import_pkg(line)
+    return import_pkg_js
+def clean_all_imports(text=None,file_path=None,import_pkg_js=None):
+    if not import_pkg_js:
+        import_pkg_js = get_all_imports(text=text,file_path=file_path)
     nu_lines = import_pkg_js["nulines"]
     for pkg,values in import_pkg_js.items():
         comments = []
-        if pkg not in ["nulines","file_path"]: 
+        if pkg not in ["nulines","file_path","all_data"]: 
             line = values.get('line')
             imports = values.get('imports')
             for i,imp in enumerate(imports):
@@ -114,9 +138,14 @@ def clean_imports(text=None,file_path=None,write=False):
                 if comments:
                     comments=','.join(comments)
                     imports+=f" #{comments}"
-                    
+            import_pkg_js[pkg]["imports"]=imports
             nu_lines[line] += imports
-    contents = '\n'.join(nu_lines)
+    import_pkg_js["nulines"]=nu_lines
+    return import_pkg_js
+def save_cleaned_imports(text=None,file_path=None,write=False,import_pkg_js=None):
+    import_pkg_js=get_all_imports(text=text,file_path=file_path,import_pkg_js=import_pkg_js)
+    import_pkg_js = clean_all_imports(text=text,file_path=file_path,import_pkg_js=import_pkg_js)
+    contents = '\n'.join(import_pkg_js["nulines"])
     if file_path and write:
         write_to_file(contents=contents,file_path=file_path)
     return contents

{abstract_utilities-0.2.2.471.dist-info → abstract_utilities-0.2.2.473.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: abstract_utilities
-Version: 0.2.2.471
+Version: 0.2.2.473
 Summary: abstract_utilities is a collection of utility modules providing a variety of functions to aid in tasks such as data comparison, list manipulation, JSON handling, string manipulation, mathematical computations, and time operations.
 Home-page: https://github.com/AbstractEndeavors/abstract_utilities
 Author: putkoff

{abstract_utilities-0.2.2.471.dist-info → abstract_utilities-0.2.2.473.dist-info}/RECORD

@@ -73,7 +73,7 @@ abstract_utilities/robust_readers/__init__.py,sha256=_1vhOG1FJnfrRK0ubkT1v6U6udH
 abstract_utilities/robust_readers/imports.py,sha256=FtNxdPoLeeNycDnl-6rBGxBfYjhQ7VhmI5guj8XKFcU,355
 abstract_utilities/robust_readers/initFuncGen.py,sha256=nrQn1KpSlPNKoOngN1uizVwNMA4llrcd8aGKqlzpXzI,5436
 abstract_utilities/robust_readers/import_utils/__init__.py,sha256=0XaHXUzvgMjSV-4VXcBB-sLcXzL3U3ssHZ95YkvgS9w,195
-abstract_utilities/robust_readers/import_utils/clean_imports.py,sha256=eqnEngnXIp6p4VtePn5BgCzUV2hHF7eVc4M_9Ty61HU,4936
+abstract_utilities/robust_readers/import_utils/clean_imports.py,sha256=ImekpGKREo3WUmkZSkKUvP6kC6kL2Jz5wGUoRP32t0c,6438
 abstract_utilities/robust_readers/import_utils/dot_utils.py,sha256=pmwnY461mOnDjIjgHD6H9MhQXFaF-q8kWerJDgJ1DuI,2364
 abstract_utilities/robust_readers/import_utils/function_utils.py,sha256=Q9NKvRov3uAaz2Aal3d6fb_opWNXHF9C8GSKOjgfO8Y,1622
 abstract_utilities/robust_readers/import_utils/import_utils.py,sha256=l0GYdtj5FEYX2yknL-8ru7_U2Sp9Hi1NpegqWPLRMc8,11705
@@ -86,7 +86,7 @@ abstract_utilities/ssh_utils/classes.py,sha256=3Q9BfLpyagNFYyiF4bt-5UCezeUJv9NK9
 abstract_utilities/ssh_utils/imports.py,sha256=oX8WAv-pkhizzko_h3fIUp9Vhsse4nR7RN2vwONxIx0,317
 abstract_utilities/ssh_utils/pexpect_utils.py,sha256=JBdOIXBTXAqE5TrsFjmPWJgwSaWyRJN8rbJ6y3_zKPY,10556
 abstract_utilities/ssh_utils/utils.py,sha256=smUWAx3nW1h0etTndJ_te9bkUX5YzQ8kYd9_gD1TXLk,4882
-abstract_utilities-0.2.2.471.dist-info/METADATA,sha256=omUQ9OGEqRJZ_Np_c72j0Q0OXBDDgUj3nHTTFvjSBWI,28108
-abstract_utilities-0.2.2.471.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-abstract_utilities-0.2.2.471.dist-info/top_level.txt,sha256=BF0GZ0xVFfN1K-hFIWPO3viNsOs1sSF86n1vHBg39FM,19
-abstract_utilities-0.2.2.471.dist-info/RECORD,,
+abstract_utilities-0.2.2.473.dist-info/METADATA,sha256=nVj-GHP9Bzs9VpesJ77x1T93HLcjeYc7VkbJjXMAsIk,28108
+abstract_utilities-0.2.2.473.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+abstract_utilities-0.2.2.473.dist-info/top_level.txt,sha256=BF0GZ0xVFfN1K-hFIWPO3viNsOs1sSF86n1vHBg39FM,19
+abstract_utilities-0.2.2.473.dist-info/RECORD,,