Commit 6c05cb5c authored by Mark Canterbury's avatar Mark Canterbury
Browse files

Removing f-strings

parent f6e48b3c
Loading
Loading
Loading
Loading
+0 −7
Original line number Original line Diff line number Diff line
from io import BytesIO
from io import BytesIO
from pathlib import Path
from pathlib import Path
import logging
import zipfile
import zipfile


# For ETSI portal attachments, a single zip archive is created which
# For ETSI portal attachments, a single zip archive is created which
@@ -34,25 +33,19 @@ import zipfile




def recursively_zip_directory(directory: Path, zipname: str, recursion=0):
def recursively_zip_directory(directory: Path, zipname: str, recursion=0):
    logging.info(
        f"{'':{recursion * 4}}Packaging contents of {directory} into {zipname}"
    )
    buffer = BytesIO()
    buffer = BytesIO()
    zip = zipfile.ZipFile(buffer, "a")
    zip = zipfile.ZipFile(buffer, "a")
    for f in directory.iterdir():
    for f in directory.iterdir():
        if f.is_file():
        if f.is_file():
            logging.info(f"{'':{recursion * 4}}Adding file: {f}")
            zip.write(f, f.name)
            zip.write(f, f.name)
        elif f.is_dir():
        elif f.is_dir():
            zipname = f.with_suffix(".zip").name
            zipname = f.with_suffix(".zip").name
            logging.info(f"{'':{recursion * 4}}Adding archive: {f}")
            recurse_buffer = recursively_zip_directory(f, zipname, recursion + 1)
            recurse_buffer = recursively_zip_directory(f, zipname, recursion + 1)
            zip.writestr(zipname, recurse_buffer.getvalue())
            zip.writestr(zipname, recurse_buffer.getvalue())
    return buffer
    return buffer




if __name__ == "__main__":
if __name__ == "__main__":
    logging.info("Creating attachments...")
    for directory in Path(".").glob("1*"):
    for directory in Path(".").glob("1*"):
        zip_name = f"ts_{directory.name}vXXYYZZp0.zip"
        zip_name = f"ts_{directory.name}vXXYYZZp0.zip"
        zip_buffer = recursively_zip_directory(directory, zip_name)
        zip_buffer = recursively_zip_directory(directory, zip_name)