@@ -42,9 +42,11 @@ def convert_collection(path: Path, output: OutputFormat) -> None:
4242 formats = list (ARCHIVE_EXTENSIONS )
4343 formats .remove (format_ )
4444 for file in list_files (path , * formats ):
45- LOGGER .info ("Converting %s to %s format" , file .name , output .name )
46- archive = get_archive (path = file )
47- archive_type .convert (old_archive = archive )
45+ with CONSOLE .status (
46+ f"Converting { file .name } to { output .name } " , spinner = "simpleDotsScrolling"
47+ ):
48+ archive = get_archive (path = file )
49+ archive_type .convert (old_archive = archive )
4850
4951
5052def read_meta (archive : BaseArchive ) -> tuple [Meta | None , Details | None ]:
@@ -303,10 +305,7 @@ def process_pages(
303305def start (settings : Settings , force : bool = False ) -> None :
304306 LOGGER .info ("Starting Perdoo" )
305307
306- with CONSOLE .status (
307- f"Searching for non-{ settings .output .format } files" , spinner = "simpleDotsScrolling"
308- ):
309- convert_collection (path = settings .input_folder , output = settings .output .format )
308+ convert_collection (path = settings .input_folder , output = settings .output .format )
310309
311310 with CONSOLE .status (
312311 f"Searching for { settings .output .format } files" , spinner = "simpleDotsScrolling"
@@ -331,20 +330,19 @@ def start(settings: Settings, force: bool = False) -> None:
331330 )
332331
333332 with TemporaryDirectory (prefix = f"{ new_file .stem } _" ) as temp_str , CONSOLE .status (
334- "Extracting files" , spinner = "simpleDotsScrolling"
333+ f "Extracting { archive . path . stem } files" , spinner = "simpleDotsScrolling"
335334 ) as status :
336335 temp_folder = Path (temp_str )
337336 if not archive .extract_files (destination = temp_folder ):
338337 return
339- status .update ("Processing pages" , spinner = "simpleDotsScrolling " )
338+ status .update ("Processing files " )
340339 process_pages (
341340 folder = temp_folder ,
342341 metadata = metadata ,
343342 metron_info = metron_info ,
344343 comic_info = comic_info ,
345344 filename = new_file .stem ,
346345 )
347- status .update ("Packaging archive" , spinner = "simpleDotsScrolling" )
348346 metadata .meta = Meta (date_ = date .today ())
349347 files = list_files (temp_folder , * IMAGE_EXTENSIONS )
350348 if settings .output .create_metadata :
@@ -359,6 +357,7 @@ def start(settings: Settings, force: bool = False) -> None:
359357 comic_info_file = temp_folder / "ComicInfo.xml"
360358 comic_info .to_file (file = comic_info_file )
361359 files .append (comic_info_file )
360+ status .update (f"Archiving { new_file .stem } " )
362361 archive_file = archive .archive_files (
363362 src = temp_folder , output_name = archive .path .stem , files = files
364363 )
0 commit comments