libretificacaotjcore 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

libretificacaotjcore/services/file_service.py

@@ -1,130 +1,53 @@
 import asyncio
+from io import BytesIO
 import os
 import shutil
 from pathlib import Path
+import zipfile
 import aiofiles
 import aiofiles.os
-import py7zr
 
 class FileService:
-    # async def zip_folder(self, folder_path: str, output_path: str):
-    #     buffer = BytesIO()
+    async def zip_folder(self, folder_path: str, output_path: str):
+        buffer = BytesIO()
         
-    #     with zipfile.ZipFile(buffer, "w", zipfile.ZIP_DEFLATED) as zip_file:
-    #         for root, _, files in os.walk(folder_path):
-    #             for file in files:
-    #                 full_path = os.path.join(root, file)
-    #                 arcname = os.path.relpath(full_path, folder_path)
-
-    #                 async with aiofiles.open(full_path, "rb") as f:
-    #                     content = await f.read()
-    #                     zip_file.writestr(arcname, content)
+        with zipfile.ZipFile(buffer, "w", zipfile.ZIP_DEFLATED) as zip_file:
+            for root, _, files in os.walk(folder_path):
+                for file in files:
+                    full_path = os.path.join(root, file)
+                    arcname = os.path.relpath(full_path, folder_path)
+
+                    async with aiofiles.open(full_path, "rb") as f:
+                        content = await f.read()
+                        zip_file.writestr(arcname, content)
         
-    #     async with aiofiles.open(output_path, "wb") as f:
-    #         await f.write(buffer.getvalue())
-            
-    # async def extract_zip(self, folder_path_zip: str, output_path: str):
-    #         if not await aiofiles.os.path.exists(folder_path_zip):
-    #             raise FileNotFoundError(
-    #                 f"Arquivo ZIP não encontrado: {folder_path_zip}"
-    #             )
-
-    #         if not await aiofiles.os.path.exists(output_path):
-    #             await aiofiles.os.makedirs(output_path, exist_ok=True)
-
-    #         loop = asyncio.get_event_loop()
-    #         await loop.run_in_executor(
-    #             None, self._extrair_zip, folder_path_zip, output_path
-    #         )
-
-    # async def remove_file(self, file_path: str):
-    #     if await aiofiles.os.path.exists(file_path):
-    #         await aiofiles.os.remove(file_path)
-            
-    # async def remove_folder(self, folder_path: str):
-    #     if await aiofiles.os.path.exists(folder_path):
-    #         loop = asyncio.get_running_loop()
-    #         await loop.run_in_executor(None, shutil.rmtree, folder_path)
-            
-    # def _extrair_zip(self, folder_path_zip: str, output_path: str):
-    #     with zipfile.ZipFile(folder_path_zip, "r") as zip_ref:
-    #         zip_ref.extractall(output_path)
-            
-    ################################################################################
-    
-    def __init__(self, threads: int = 1):
-        # Se não especificado, usa todos os núcleos disponíveis
-        self.threads = threads or os.cpu_count()
-
-    async def compress_folder(self, folder_path: str, output_path: str):
-        """
-        Compacta uma pasta inteira para .7z de forma mais robusta.
-        """
-        if not await aiofiles.os.path.exists(folder_path):
-            raise FileNotFoundError(f"Pasta não encontrada: {folder_path}")
-
-        os.makedirs(os.path.dirname(output_path), exist_ok=True)
-
-        await asyncio.to_thread(
-            self._compress_folder_sync, folder_path, output_path
-        )
-
-    def _compress_folder_sync(self, folder_path: str, output_path: str):
-        # Tentar diferentes configurações em ordem de preferência
-        configurations = [
-            # Configuração 1: LZMA2 com preset
-            {"filters": [{"id": py7zr.FILTER_LZMA2, "preset": py7zr.PRESET_DEFAULT}]},
-            
-            # Configuração 2: LZMA2 com parâmetros manuais válidos
-            {"filters": [{"id": py7zr.FILTER_LZMA2, "dict_size": 16777216}]},  # 16MB
+        async with aiofiles.open(output_path, "wb") as f:
+            await f.write(buffer.getvalue())
             
-            # Configuração 3: Padrão sem filtros customizados
-            {}
-        ]
-
-        last_error = None
-        for i, config in enumerate(configurations):
-            try:
-                print(f"Tentando configuração {i + 1}...")
-                with py7zr.SevenZipFile(output_path, mode="w", **config) as archive:
-                    archive.writeall(folder_path, arcname="")
-                print(f"Sucesso com configuração {i + 1}!")
-                return
-            except Exception as e:
-                print(f"Configuração {i + 1} falhou: {e}")
-                last_error = e
-                continue
-        
-        # Se todas as configurações falharam
-        raise Exception(f"Todas as configurações falharam. Último erro: {last_error}")
+    async def extract_zip(self, folder_path_zip: str, output_path: str):
+            if not await aiofiles.os.path.exists(folder_path_zip):
+                raise FileNotFoundError(
+                    f"Arquivo ZIP não encontrado: {folder_path_zip}"
+                )
 
-    async def extract_file(self, file_path_7z: str, output_path: str):
-        """
-        Extrai um arquivo .7z de forma assíncrona.
-        """
-        if not await aiofiles.os.path.exists(file_path_7z):
-            raise FileNotFoundError(f"Arquivo 7z não encontrado: {file_path_7z}")
+            if not await aiofiles.os.path.exists(output_path):
+                await aiofiles.os.makedirs(output_path, exist_ok=True)
 
-        os.makedirs(output_path, exist_ok=True)
-
-        await asyncio.to_thread(
-            self._extract_7z_sync, file_path_7z, output_path
-        )
-
-    def _extract_7z_sync(self, file_path_7z: str, output_path: str):
-        with py7zr.SevenZipFile(file_path_7z, mode="r") as archive:
-            archive.extractall(path=output_path)
+            loop = asyncio.get_event_loop()
+            await loop.run_in_executor(
+                None, self._extrair_zip, folder_path_zip, output_path
+            )
 
     async def remove_file(self, file_path: str):
-        """
-        Remove um arquivo de forma assíncrona.
-        """
         if await aiofiles.os.path.exists(file_path):
             await aiofiles.os.remove(file_path)
-
+            
     async def remove_folder(self, folder_path: str):
-        """
-        Remove uma pasta inteira de forma assíncrona.
-        """
         if await aiofiles.os.path.exists(folder_path):
-            await asyncio.to_thread(shutil.rmtree, folder_path)
+            loop = asyncio.get_running_loop()
+            await loop.run_in_executor(None, shutil.rmtree, folder_path)
+            
+    def _extrair_zip(self, folder_path_zip: str, output_path: str):
+        with zipfile.ZipFile(folder_path_zip, "r") as zip_ref:
+            zip_ref.extractall(output_path)
+            

{libretificacaotjcore-0.1.8.dist-info → libretificacaotjcore-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libretificacaotjcore
-Version: 0.1.8
+Version: 0.1.10
 Summary: Biblioteca para centralizar conexao com filas no rabbit e banco de dados no mongodb para os servicos de retificacao da TJ
 Author-email: Jhonatan Azevedo <dev.azevedo@outlook.com>
 Project-URL: Homepage, https://github.com/seu-usuario/libretificacaotjcore

{libretificacaotjcore-0.1.8.dist-info → libretificacaotjcore-0.1.10.dist-info}/RECORD

@@ -5,10 +5,10 @@ libretificacaotjcore/database/config_db.py,sha256=ydY83Xn16DcAO-apH1nIJ1hKL_38hE
 libretificacaotjcore/dtos/solicitacao_dto.py,sha256=A0QU6MwuyK6Z2vYy4FknSAOfebpY4txB-YmgpFhAVCY,2460
 libretificacaotjcore/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 libretificacaotjcore/services/crypto_pass_service.py,sha256=HdZ7IqrPOf55CpxJgn6EaZfxiOC6TycNAnBhehYn8U8,283
-libretificacaotjcore/services/file_service.py,sha256=SpNXC_2QF5Rlj9FVAIx_ZNnaQ6hrPBIGHazapl7qKTM,5290
+libretificacaotjcore/services/file_service.py,sha256=14CJokBbrsryQGmL0_unH2QKZpnteEAfxf5CPFdv6cE,2075
 libretificacaotjcore/services/rabbitmq_consumer.py,sha256=a25mRHjbkgO3lkdCJ5NpJfWAGHhVkQDCRDR2t8hMNAI,1710
 libretificacaotjcore/services/s3_service.py,sha256=HKR_jt2H3XdV1PCzo5R5bnhmoQ3I46Yn5IqAvVPhsjs,2946
-libretificacaotjcore-0.1.8.dist-info/METADATA,sha256=UKGi6EoT_gLuCJhOiFfjMYvWRTNDf0Dw9M2ahrE5dKI,1467
-libretificacaotjcore-0.1.8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-libretificacaotjcore-0.1.8.dist-info/top_level.txt,sha256=J9vnz_X9OUnxC-eXHiAzlc9xIrWBwZ5bgnIDQIIFY4c,21
-libretificacaotjcore-0.1.8.dist-info/RECORD,,
+libretificacaotjcore-0.1.10.dist-info/METADATA,sha256=pNtqklsOV1siH1M3jb529ce9nDaTJ1tLlXymiucOgCA,1468
+libretificacaotjcore-0.1.10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+libretificacaotjcore-0.1.10.dist-info/top_level.txt,sha256=J9vnz_X9OUnxC-eXHiAzlc9xIrWBwZ5bgnIDQIIFY4c,21
+libretificacaotjcore-0.1.10.dist-info/RECORD,,