Fixing cleanup.

loaih/script.py

@@ -98,12 +98,6 @@ def batch(yamlfile, verbose):
         # Generic run for the query
         generic = loaih.Solver.parse(cbuild['query'])
 
-        # In case prerelease or daily branches are used, cleanup the download
-        # folder before first run (to make sure the contents are effectively
-        # fresh).
-        if generic.branch in {'prerelease', 'daily'}:
-            generic.cleanup_downloads(gvars['download_path'], verbose)
-
         for obj in collection:
             # Configuration phase
             obj.verbose = verbose
@@ -131,6 +125,18 @@ def batch(yamlfile, verbose):
                 obj.generalize_and_link()
             del obj
 
+    # In case prerelease or daily branches are used, cleanup the download
+    # folder after finishing the complete run (to make sure the next run
+    # will redownload all the needed files and is indeed fresh).
+    # we will swipe all the builds inside a collection to understand the files
+    # to delete.
+    for cbuild in config['builds']:
+        # Loop a run for each build.
+        for build in loaih.build.Collection(cbuild['query']):
+
+            if build.version.branch in {'prerelease', 'daily'}:
+                build.version.cleanup_downloads(gvars['download_path'], verbose)
+
 
 @cli.command()
 @click.option('-a', '--arch', 'arch', default='x86_64',

setup.py

@@ -11,7 +11,7 @@ long_description = (this_directory / "README.md").read_text()
 
 setup(
     name="loaih",
-    version="1.3.2",
+    version="1.3.3",
     description="LOAIH - LibreOffice AppImage Helpers, help build a LibreOffice AppImage",
     long_description=long_description,
     long_description_content_type='text/markdown',