shares.py: accurate current_folder_count during rescan

Author: slook

pynicotine/shares.py

@@ -532,6 +532,8 @@ def scan_shared_folder(self, shared_folder_path, old_mtimes, old_files):
                 # Sharing a folder twice, no go
                 continue
 
+            self.queue.put(self.current_folder_count)
+
             file_list = []
 
             try:
@@ -544,11 +546,7 @@ def scan_shared_folder(self, shared_folder_path, old_mtimes, old_files):
                             if self.is_hidden(path, entry=entry):
                                 continue
 
-                            self.current_folder_count += 1
                             folder_paths.append(path)
-
-                            if not self.current_folder_count % 100:
-                                self.queue.put(self.current_folder_count)
                             continue
 
                         try:
@@ -593,6 +591,7 @@ def scan_shared_folder(self, shared_folder_path, old_mtimes, old_files):
                 )
 
             self.streams[virtual_folder_path] = self.get_folder_stream(file_list)
+            self.current_folder_count += 1
 
     def get_audio_tag(self, file_path, size):
 
@@ -1107,7 +1106,7 @@ def _process_scanner(self, scanner_queue, emit_event=None):
 
         successful = True
 
-        while self._scanner_process.is_alive():
+        while self._scanner_process.is_alive() and successful:
             # Cooldown
             time.sleep(0.05)
 
@@ -1118,16 +1117,16 @@ def _process_scanner(self, scanner_queue, emit_event=None):
                     successful = False
                     break
 
-                if isinstance(item, int):
+                if isinstance(item, tuple):
+                    self.file_path_index = item
+
+                elif isinstance(item, int):
                     if emit_event is not None:
                         emit_event("shares-scanning", item)
 
                 elif isinstance(item, ScannerLogMessage):
                     log.add(item.msg, item.msg_args)
 
-                elif isinstance(item, tuple):
-                    self.file_path_index = item
-
                 elif isinstance(item, SharedFileListResponse):
                     self.compressed_shares[item.permission_level] = item