effectual 0.3.5__py3-none-any.whl → 0.4.0__py3-none-any.whl

effectual/build.py

@@ -21,14 +21,14 @@ def bundleFiles(
     compressionLevel: int,
     minification: bool,
 ) -> None:
-    """Bundles dependencies and scripts into a single .py archive
+    """Bundles dependencies and scripts into a single .pyz archive
 
     Args:
         sourceDirectory (Path): Source directory which must contain a __main__.py script
         outputDirectory (Path): Output directory for the bundle
         outputFileName (str): Name of the output bundle
         compressionLevel (int): Compression level for the bundle from 0-9
-        minification (bool): If the dependencies and scripts should be minified
+        minification (bool): If the scripts should be minified
     """
     outputDirectory.mkdir(parents=True, exist_ok=True)
     outputPath: Path = outputDirectory / outputFileName
@@ -90,11 +90,12 @@ def dependencies(minify: bool) -> None:
 
 
 def optimizeDependencies(file: Path) -> None:
+    stringFile: str = str(file)
     if (
         file.suffix in (".pyc", ".pyd", ".exe", ".typed")
-        or "__pycache__" in str(file)
-        or ".dist-info" in str(file)
-        or ".lock" in str(file)
+        or "__pycache__" in stringFile
+        or ".dist-info" in stringFile
+        or ".lock" in stringFile
     ):
         try:
             file.unlink()
@@ -128,7 +129,7 @@ def main() -> None:
         )
 
     uvHashPath: Path = Path("./.effectual_cache/pyprojectHash.toml")
-    currentHash: dict[str, dict] = dict()
+    currentHash: dict[str, dict[str, str]] = dict()
 
     startTime = perf_counter()
 
@@ -139,7 +140,7 @@ def main() -> None:
 
     if uvHashPath.exists():
         with open(uvHashPath, "r") as file:
-            lastHash: dict = dict(rtoml.load(file)).get("hashes")
+            lastHash: dict[Any, Any] = dict(rtoml.load(file)).get("hashes")
         if currentHash["hashes"] != lastHash:
             with open(uvHashPath, "w") as file:
                 rtoml.dump(currentHash, file)

effectual/developer.py

@@ -40,12 +40,12 @@ def main() -> None:
 
     runCommand = subprocess.Popen(["uv", "run", outputFile], shell=True)
 
-    lastHashList: list[str] = getAllHashes(sourceDirectory)
+    lastHashSet: set[str] = getAllHashes(sourceDirectory, ".py")
 
     while True:
-        currentHashList: list[str] = getAllHashes(sourceDirectory)
-        if currentHashList != lastHashList:
-            lastHashList = currentHashList
+        currentHashSet: set[str] = getAllHashes(sourceDirectory, ".py")
+        if currentHashSet != lastHashSet:
+            lastHashSet = currentHashSet
             runCommand.kill()
             runCommand.wait()
             outputFile.unlink()

effectual/fileHash.py

@@ -7,26 +7,28 @@ def getFilehash(filePath: Path) -> str:
     """Gets the file hash of a single python script
 
     Args:
-        filePath (Path): Path to the python script
+        filePath (Path): Path to a file
 
     Returns:
-        str: Hash of the python script
+        str: Hash of the file
     """
     with open(filePath, "rb") as file:
-        fileHash = hashlib.sha256(file.read()).hexdigest()
+        fileHash = hashlib.sha1(file.read()).hexdigest()
     return fileHash
 
 
-def getAllHashes(sourceDirectory: Path) -> list[str]:
+def getAllHashes(sourceDirectory: Path, fileExtension: str) -> set[str]:
     """Gets all hashes in directory
 
     Args:
-        sourceDirectory (Path): Path to the python scripts
+        sourceDirectory (Path): Path to a folder containing files
 
     Returns:
-        dict[str]: Dictionary containing paths and hashes
+        set[str]: Set containing paths and hashes
     """
 
     with Pool() as pool:
-        hashList: list[str] = pool.map(getFilehash, sourceDirectory.glob("*.py"))
+        hashList: set[str] = set(
+            pool.map(getFilehash, sourceDirectory.glob(f"*.{fileExtension}"))
+        )
     return hashList

{effectual-0.3.5.dist-info → effectual-0.4.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: effectual
-Version: 0.3.5
+Version: 0.4.0
 Summary: A python package/script bundler
 Project-URL: Homepage, https://github.com/effectualpy/effectual
 Author-email: jake <jakewdr@proton.me>

effectual-0.4.0.dist-info/RECORD

@@ -0,0 +1,12 @@
+effectual/__init__.py,sha256=9hA5S-390BtY7m-NojGHioaBJJ8vEM3IXuMvmzWBv0E,407
+effectual/build.py,sha256=LjPsTegLoxf2Ta3VwOV2LcMITf7ZEdPOuIcAJ0RXq7M,5669
+effectual/colors.py,sha256=na7SEUSXM7aHvEKeIAn5shrZJtrBYq_ZUp121GRO_PQ,1411
+effectual/config.py,sha256=otTF0HIBwECrHpXsB-e_rlxDZg5uRwIIoUPC37TZl8Q,1165
+effectual/developer.py,sha256=-S55Vllozoi-WlJKjD2SXiuLuOuGEHnsmz1I3S5vIUo,2053
+effectual/fileHash.py,sha256=ftFDY0RY1RF-IQxgbS9HfJp9mzgc3I6Acl69CIKUL2o,848
+effectual/minifier.py,sha256=7GHgQWzin2J1W62yMReHXaYIChXc3f0rNJA-yY4LDEI,1313
+effectual-0.4.0.dist-info/METADATA,sha256=heiu95UEveT9SrhVpai8S_fLEToTc56u55kjSqWQTxo,2527
+effectual-0.4.0.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+effectual-0.4.0.dist-info/entry_points.txt,sha256=1W7EjlLZkw_Wz8V1SgdzzDis-CRE5IINyg74upsB0zU,40
+effectual-0.4.0.dist-info/licenses/LICENSE,sha256=RrVXS_K_FctToNx9BLuZm9vbcpTi3PHNzWMaz7QyVeg,1082
+effectual-0.4.0.dist-info/RECORD,,

effectual-0.3.5.dist-info/RECORD

@@ -1,12 +0,0 @@
-effectual/__init__.py,sha256=9hA5S-390BtY7m-NojGHioaBJJ8vEM3IXuMvmzWBv0E,407
-effectual/build.py,sha256=jyLiuQXKl1pjG8gtgQDafqiFQXgGo8DLwVn9kdIzqdw,5629
-effectual/colors.py,sha256=na7SEUSXM7aHvEKeIAn5shrZJtrBYq_ZUp121GRO_PQ,1411
-effectual/config.py,sha256=otTF0HIBwECrHpXsB-e_rlxDZg5uRwIIoUPC37TZl8Q,1165
-effectual/developer.py,sha256=l7olxXwsGbdd5uGkxXMaFabaQo8A8qzrFMCewKuzx9M,2047
-effectual/fileHash.py,sha256=m2oPjhAcSH0Qc7J7aMkmjOlgDr5Lzilcfl1ppeoDxI8,810
-effectual/minifier.py,sha256=7GHgQWzin2J1W62yMReHXaYIChXc3f0rNJA-yY4LDEI,1313
-effectual-0.3.5.dist-info/METADATA,sha256=CtVXhoTgNE7vkUj-Y_yOm9wwporcS_rXE0cw6xIc6yw,2527
-effectual-0.3.5.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
-effectual-0.3.5.dist-info/entry_points.txt,sha256=1W7EjlLZkw_Wz8V1SgdzzDis-CRE5IINyg74upsB0zU,40
-effectual-0.3.5.dist-info/licenses/LICENSE,sha256=RrVXS_K_FctToNx9BLuZm9vbcpTi3PHNzWMaz7QyVeg,1082
-effectual-0.3.5.dist-info/RECORD,,