diff --git a/pandora-box.curses b/pandora-box.curses index ed713ea..8119461 100644 --- a/pandora-box.curses +++ b/pandora-box.curses @@ -19,3 +19,5 @@ QUARANTINE = True ; Set quarantine folder QUARANTINE_FOLDER = /var/quarantine +; Maximum number of threads +THREADS = 2 diff --git a/pandora-box.ini.curses b/pandora-box.ini.curses index ed713ea..c714679 100644 --- a/pandora-box.ini.curses +++ b/pandora-box.ini.curses @@ -19,3 +19,5 @@ QUARANTINE = True ; Set quarantine folder QUARANTINE_FOLDER = /var/quarantine +; Maximum number of threads +THREADS = 4 diff --git a/pandora-box.ini.rpi b/pandora-box.ini.rpi index 483c53f..e6a0a42 100644 --- a/pandora-box.ini.rpi +++ b/pandora-box.ini.rpi @@ -19,3 +19,5 @@ QUARANTINE = True ; Set quarantine folder QUARANTINE_FOLDER = /var/quarantine +; Maximum number of threads +THREADS = 1 diff --git a/pandora-box.ini.ubuntu b/pandora-box.ini.ubuntu index 483c53f..4ea9e16 100644 --- a/pandora-box.ini.ubuntu +++ b/pandora-box.ini.ubuntu @@ -19,3 +19,5 @@ QUARANTINE = True ; Set quarantine folder QUARANTINE_FOLDER = /var/quarantine +; Maximum number of threads +THREADS = 4 diff --git a/pandora-box.py b/pandora-box.py index 1484127..fb3622f 100755 --- a/pandora-box.py +++ b/pandora-box.py @@ -37,7 +37,6 @@ import pypandora # ----------------------------------------------------------- # Threading variables # ----------------------------------------------------------- -maxThread = 24 threads = [] exitFlag = False queueLock = threading.Lock() @@ -52,6 +51,7 @@ pandora_root_url = None has_quarantine = None quarantine_folder = None has_curses = None +maxThreads = None # ----------------------------------------------------------- # Curses @@ -173,7 +173,8 @@ class scanThread (threading.Thread): # ---------------------------------------------------------- def config(): - global is_fake_scan, has_usb_auto_mount, pandora_root_url, has_quarantine, quarantine_folder, has_curses + global is_fake_scan, has_usb_auto_mount, pandora_root_url + global has_quarantine, quarantine_folder, has_curses, maxThreads """ read configuration file """ # intantiate a ConfirParser config_parser = configparser.ConfigParser() @@ -188,7 +189,8 @@ def config(): quarantine_folder = config_parser['DEFAULT']['QUARANTINE_FOLDER'] # Curses has_curses = config_parser['DEFAULT']['CURSES'].lower() == "true" - print(f'has_curses={has_curses}') + # MaxThreads + maxThreads = int(config_parser['DEFAULT']['THREADS']) # ---------------------------------------------------------- @@ -559,7 +561,7 @@ def scan(): exitFlag = False # Instanciate threads - for i in range(maxThread): + for i in range(maxThreads): thread = scanThread(i) thread.start() threads.append(thread)