soup-files 1.2.1__py3-none-any.whl → 1.2.2__py3-none-any.whl

soup_files/__main__.py

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+from soup_files import __version__
+
+def test():
+    from soup_files import File, Directory, UserFileSystem, LibraryDocs, InputFiles
+    pass
+    
+
+def main():
+    print(f' soup_files - versão: {__version__}')
+    test()
+
+if __name__ == '__main__':
+    main()

soup_files/files.py

@@ -190,12 +190,13 @@ class Directory(object):
         return values
 
     def __content_no_recursive(self) -> List[File]:
-        files = os.listdir(self.absolute())
+        content_files: List[str] = os.listdir(self.absolute())
         values: List[File] = []
-        for f in files:
-            if os.path.isfile(f):
+        for file in content_files:
+            fp: str = os.path.join(self.absolute(), file)
+            if os.path.isfile(fp):
                 values.append(
-                    File(os.path.abspath(f))
+                    File(os.path.abspath(fp))
                 )
         return values
 
@@ -216,9 +217,10 @@ class Directory(object):
         else:
             _paths = os.listdir(self.absolute())
             for d in _paths:
-                if os.path.isdir(d):
+                _dirpath = os.path.join(self.absolute(), d)
+                if os.path.isdir(_dirpath):
                     values.append(
-                        Directory(os.path.abspath(d))
+                        Directory(os.path.abspath(_dirpath))
                     )
         return values
     
@@ -285,7 +287,6 @@ class InputFiles(object):
         return content_files
 
     def __get_files_recursive(self, *, file_type: LibraryDocs, sort: bool) -> List[File]:
-        #
         #
         _paths: List[Path] = self.input_dir.iterpaths()
         _all_files = []
@@ -319,33 +320,25 @@ class InputFiles(object):
             _all_files.sort(key=File.absolute)
         return _all_files
 
-    def __get_files_no_recursive(self, *, file_type: LibraryDocs, sort: bool):
-        _paths: List[str] = os.listdir(self.input_dir.absolute())
-        _all_files = []
+    def __get_files_no_recursive(self, *, file_type: LibraryDocs, sort: bool) -> List[File]:
+        _content_files: List[File] = self.input_dir.content_files(recursive=False)
+        
+        _all_files: List[File] = []
         count: int = 0
         if file_type == LibraryDocs.ALL:
             # Todos os tipos de arquivos
-            for p in _paths:
-                if os.path.isfile(p):
-                    _all_files.append(
-                        File(os.path.abspath(p))
-                    )
-                    count += 1
-                    if count >= self.maxFiles:
-                        break
+            for file in _content_files:
+                _all_files.append(file)
+                count += 1
+                if count == self.maxFiles:
+                    break
         else:
             # Arquivos especificados em LibraryDocs
-            for p in _paths:
-                if os.path.isfile(p):
-                    _path_file = Path(p)
-                    if (_path_file.suffix is None) or (_path_file.suffix == ''):
-                        continue
-                    if _path_file.suffix in file_type.value:
-                        _all_files.append(
-                            File(os.path.abspath(_path_file.absolute()))
-                        )
-                        count += 1
-                    if count >= self.maxFiles:
+            for file in _content_files:
+                if file.extension() in file_type.value:
+                    _all_files.append(file)
+                    count += 1
+                    if count == self.maxFiles:
                         break
         if sort:
             _all_files.sort(key=File.absolute)
@@ -366,9 +359,8 @@ class InputFiles(object):
         
         """
         if recursive:
-            return self.__get_files_recursive(file_type=file_type, sort=sort)
-        else:
-            return self.__get_files_no_recursive(file_type=file_type, sort=sort)
+            return self.__get_files_recursive(file_type=file_type, sort=sort)    
+        return self.__get_files_no_recursive(file_type=file_type, sort=sort)
 
 
 class JsonData(object):
@@ -451,13 +443,8 @@ class UserFileSystem(object):
     """
         Diretórios comuns para cache e configurações de usuário.
     """
-    def __init__(self, base_home:Directory=None):
-        if base_home is None:
-            self.baseHome:Directory = Directory(os.path.abspath(Path().home()))
-        elif isinstance(base_home, Directory):
-            self.baseHome:Directory = base_home
-        else:
-            raise ValueError(f'{__class__.__name__}\nUse:Directory(), não {type(base_home)}')
+    def __init__(self, base_home: Directory = Directory(os.path.abspath(Path().home()))):
+        self.baseHome:Directory = base_home
         self.userDownloads:Directory = self.baseHome.concat('Downloads', create=True)
         self.userVarDir:Directory = self.baseHome.concat('var', create=True)
         
@@ -472,11 +459,11 @@ class UserAppDir(object):
     """
         Diretório comun para cache e configurações do aplicativo.
     """
-    def __init__(self, appname:str, *, user_file_system:UserFileSystem=UserFileSystem()):
+    def __init__(self, appname:str, *, user_file_system: UserFileSystem = UserFileSystem()):
         self.appname = appname
-        self.userFileSystem:UserFileSystem = user_file_system
-        self.workspaceDirApp:Directory = self.userFileSystem.userDownloads.concat(self.appname, create=True)
-        self.installDir:Directory = self.userFileSystem.userVarDir.concat('opt').concat(self.appname, create=True)
+        self.userFileSystem: UserFileSystem = user_file_system
+        self.workspaceDirApp: Directory = self.userFileSystem.userDownloads.concat(self.appname, create=True)
+        self.installDir: Directory = self.userFileSystem.userVarDir.concat('opt').concat(self.appname, create=True)
         
     def cache_dir_app(self) -> Directory:
         return self.userFileSystem.cache_dir().concat(self.appname, create=True)

soup_files/version.py

@@ -1,3 +1,3 @@
 #!/usr/bin/env python3
 
-__version__ = '1.2.1'
+__version__ = '1.2.2'

{soup_files-1.2.1.dist-info → soup_files-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: soup_files
-Version: 1.2.1
+Version: 1.2.2
 Summary: soup_files
 Author: Bruno Chaves
 Requires-Python: >=3.11

soup_files-1.2.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+soup_files/__init__.py,sha256=G91WhdwJvUJJLiIDL2XSGSqZNwLoJ7gfLfiYquUkNpk,299
+soup_files/__main__.py,sha256=4n2EX5vpzi23kXwofvCzQirZI8kRYDT7LYgLlb6bK1E,282
+soup_files/files.py,sha256=lGJlh4JIuYjLcSNfgk7h6t36yp6wPO0Q1pVZ7F0_Q6Y,15354
+soup_files/progress.py,sha256=kGPESPQCmoIlgJoy7Y8sF5ZG9tfx6uafXYrcBAPibfY,2903
+soup_files/version.py,sha256=uEbUu3tUCXHsVQ_A4NejisFTCeRZeOBepKbXH7WD88c,46
+soup_files-1.2.2.dist-info/METADATA,sha256=93hcC54kweMypQit8HA5U21np6TgdcMf9PScfa8_l1I,174
+soup_files-1.2.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+soup_files-1.2.2.dist-info/top_level.txt,sha256=CBSaCdIqL_Rlkr74APmmI0kXkPK9pVf6HTlOPZ-Kk4E,11
+soup_files-1.2.2.dist-info/RECORD,,

soup_files-1.2.1.dist-info/RECORD

@@ -1,8 +0,0 @@
-soup_files/__init__.py,sha256=G91WhdwJvUJJLiIDL2XSGSqZNwLoJ7gfLfiYquUkNpk,299
-soup_files/files.py,sha256=QN29DUXrQtqS_wI_KawqUB0XCyjnzH4cgyolaXdkg04,15784
-soup_files/progress.py,sha256=kGPESPQCmoIlgJoy7Y8sF5ZG9tfx6uafXYrcBAPibfY,2903
-soup_files/version.py,sha256=TpmZmL9rNerchvGdpdGh4bPNo516cs6BzzXctjsbRq8,46
-soup_files-1.2.1.dist-info/METADATA,sha256=jqN1cgUQJGoi-kCfi2aU901x6o1af2lIwmr5vti9s54,174
-soup_files-1.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-soup_files-1.2.1.dist-info/top_level.txt,sha256=CBSaCdIqL_Rlkr74APmmI0kXkPK9pVf6HTlOPZ-Kk4E,11
-soup_files-1.2.1.dist-info/RECORD,,