@@ -893,6 +893,7 @@ class PostProcessorWorker:
total_downloaded_this_post = 0
total_skipped_this_post = 0
history_data_for_this_post = None
temp_filepath_for_return = None
parsed_api_url = urlparse ( self . api_url_input )
referer_url = f " https:// { parsed_api_url . netloc } / "
@@ -1297,10 +1298,12 @@ class PostProcessorWorker:
with open ( temp_filepath , ' w ' , encoding = ' utf-8 ' ) as f :
json . dump ( content_data , f , indent = 2 )
self . logger ( f " Saved temporary text for ' { post_title } ' for single PDF compilation. " )
return 0 , 0 , [ ] , [ ] , [ ] , None , temp_filepath
self . _emit_signal ( ' worker_finished ' , ( 0 , 0 , [ ] , [ ] , [ ] , None , temp_filepath ) ) # <--- CHANGE THIS
return ( 0 , 0 , [ ] , [ ] , [ ] , None , temp_filepath )
except Exception as e :
self . logger ( f " ❌ Failed to write temporary file for single PDF: { e } " )
return 0 , 0 , [ ] , [ ] , [ ] , None , None
self . _emit_signal ( ' worker_finished ' , ( 0 , 0 , [ ] , [ ] , [ ] , [ ] , None ) )
return ( 0 , 0 , [ ] , [ ] , [ ] , [ ] , None )
# --- Logic for Individual File Saving ---
else :
@@ -1320,7 +1323,9 @@ class PostProcessorWorker:
if FPDF :
self . logger ( f " Converting to PDF... " )
pdf = PDF ( )
font_path = os . path . join ( self . app_base_dir , ' data ' , ' dejavu-sans ' , ' DejaVuSans.ttf ' )
font_path = " "
if self . project_root_dir :
font_path = os . path . join ( self . project_root_dir , ' data ' , ' dejavu-sans ' , ' DejaVuSans.ttf ' )
try :
if not os . path . exists ( font_path ) : raise RuntimeError ( f " Font file not found: { font_path } " )
pdf . add_font ( ' DejaVu ' , ' ' , font_path , uni = True )
@@ -1745,12 +1750,8 @@ class PostProcessorWorker:
permanent_failures_this_post , history_data_for_this_post ,
None ) # The 7th item is None because we already saved the temp file
# In Single PDF mode, the 7th item is the temp file path we created.
if self . single_pdf_mode and os . path . exists ( temp_filepath ) :
result_tuple = ( 0 , 0 , [ ] , [ ] , [ ] , None , temp_filepath )
self . _emit_signal ( ' worker_finished ' , result_tuple )
return # The method now returns nothing.
return result_tuple
class DownloadThread ( QThread ) :
progress_signal = pyqtSignal ( str )
@@ -1887,27 +1888,59 @@ class DownloadThread (QThread ):
self . skip_current_file_flag . set ( )
else : self . logger ( " ℹ ️ " )
def run ( self ) :
def run ( self ) :
"""
The main execution method for the single-threaded download process.
This version is corrected to handle 7 return values from the worker and
to pass the ' single_pdf_mode ' setting correctly.
"""
grand_total_downloaded_files = 0
grand_total_skipped_files = 0
grand_list_of_kept_original_filenames = [ ]
was_process_cancelled = False
grand_total_downloaded_files = 0
grand_total_skipped_files = 0
grand_list_of_kept_original_filenames = [ ]
was_process_cancelled = False
# This block for initializing manga mode counters remains unchanged
if self . manga_mode_active and self . manga_filename_style == STYLE_DATE_BASED and not self . extract_links_only and self . manga_date_file_counter_ref is None :
# ... (existing manga counter initialization logic) ...
if self . manga_mode_active and self . manga_filename_style == STYLE_DATE_BASED and not self . extract_links_only and self . manga_date_file_counter_ref is None :
# Determine the directory to scan for existing numbered files
series_scan_dir = self . output_dir
if self . use_subfolders :
if self . filter_character_list_objects_initial and self . filter_character_list_objects_initial [ 0 ] and self . filter_character_list_objects_initial [ 0 ] . get ( " name " ) :
series_folder_name = clean_folder_name ( self . filter_character_list_objects_initial [ 0 ] [ " name " ] )
series_scan_dir = os . path . join ( series_scan_dir , series_folder_name )
elif self . service and self . user_id :
creator_based_folder_name = clean_folder_name ( str ( self . user_id ) )
series_scan_dir = os . path . join ( series_scan_dir , creator_based_folder_name )
highest_num = 0
if os . path . isdir ( series_scan_dir ) :
self . logger ( f " ℹ ️ ' { series_scan_dir } ' ... " )
for dirpath , _ , filenames_in_dir in os . walk ( series_scan_dir ) :
for filename_to_check in filenames_in_dir :
# Check for an optional prefix defined by the user
prefix_to_check = clean_filename ( self . manga_date_prefix . strip ( ) ) if self . manga_date_prefix and self . manga_date_prefix . strip ( ) else " "
name_part_to_match = filename_to_check
if prefix_to_check and name_part_to_match . startswith ( prefix_to_check ) :
name_part_to_match = name_part_to_match [ len ( prefix_to_check ) : ] . lstrip ( )
# Use regex to find the number at the start of the filename
base_name_no_ext = os . path . splitext ( name_part_to_match ) [ 0 ]
match = re . match ( r " ( \ d+) " , base_name_no_ext )
if match :
highest_num = max ( highest_num , int ( match . group ( 1 ) ) )
# Initialize the shared counter to the next number, protected by a thread lock
self . manga_date_file_counter_ref = [ highest_num + 1 , threading . Lock ( ) ]
self . logger ( f " ℹ ️ { self . manga_date_file_counter_ref [ 0 ] } . " )
pass
if self . manga_mode_active and self . manga_filename_style == STYLE_POST_TITLE_GLOBAL_NUMBERING and not self . extract_links_only and self . manga_global_file_counter_ref is None :
# ... (existing manga counter initialization logic) ...
if self . manga_mode_active and self . manga_filename_style == STYLE_POST_TITLE_GLOBAL_NUMBERING and not self . extract_links_only and self . manga_global_file_counter_ref is None :
# Initialize the shared counter at 1, protected by a thread lock
self . manga_global_file_counter_ref = [ 1 , threading . Lock ( ) ]
self . logger ( f " ℹ ️ { self . manga_global_file_counter_ref [ 0 ] } . " )
pass
worker_signals_obj = PostProcessorSignals ( )
try :
try :
# Connect signals
worker_signals_obj . progress_signal . connect ( self . progress_signal )
worker_signals_obj . file_download_status_signal . connect ( self . file_download_status_signal )
@@ -2052,6 +2085,7 @@ class DownloadThread (QThread ):
# Emit the final signal with all collected results
self . finished_signal . emit ( grand_total_downloaded_files , grand_total_skipped_files , self . isInterruptionRequested ( ) , grand_list_of_kept_original_filenames )
def receive_add_character_result ( self , result ) :
with QMutexLocker ( self . prompt_mutex ) :
self . _add_character_response = result
