ffconverter 2.2.2__tar.gz → 2.3.0__tar.gz

{ffconverter-2.2.2 → ffconverter-2.3.0}/ChangeLog

@@ -1,3 +1,11 @@
+Version 2.3.0
+-------------
+
+* Added toggle to use a mobile UI, which has less features
+  but fits on smaller screens (Linux/Windows Phones)
+
+* Image conversion on Windows doesn't get stuck anymore
+
 Version 2.2.2
 -------------
 

{ffconverter-2.2.2 → ffconverter-2.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ffconverter
-Version: 2.2.2
+Version: 2.3.0
 Summary: File Format Converter with Qt GUI
 Home-page: https://github.com/l-koehler/FF-converter
 Author: Ilias Stamatis

{ffconverter-2.2.2 → ffconverter-2.3.0}/README.md

@@ -16,7 +16,7 @@ MacOS should work, but I don't have a Mac, so I can't test that.
 * python3  
 * pyqt5  
 
-On Linux, use your distributions package manager or pip to install these.
+On Linux, use your distributions package manager or pip to install these.  
 On Windows, use [python.org](https://python.org) to get python (the version  
 in the Microsoft Store is [worse in some regards](https://docs.python.org/3/using/windows.html#known-issues)), then use  
 `python -m pip install PyQt5` to get PyQt5.  

{ffconverter-2.2.2 → ffconverter-2.3.0}/ffconverter/__init__.py

@@ -4,8 +4,8 @@ GUI File Format Converter
 
 # version
 __major__ = 2
-__minor__ = 2
-__patch__ = 2
+__minor__ = 3
+__patch__ = 0
 __prerelease__ = "" # alpha, beta, rc etc.
 
 # package information

{ffconverter-2.2.2 → ffconverter-2.3.0}/ffconverter/dynamictab.py

@@ -39,8 +39,7 @@ class DynamicTab(QWidget):
         hlayout2 = utils.add_to_layout('h', self.commonformatQChB)
         final_layout = utils.add_to_layout('v', hlayout1, hlayout2)
         self.setLayout(final_layout)
-        
-        
+
         # default to only common formats
         self.commonformatQChB.setChecked(True)
         self.commonformatQChB.stateChanged.connect(parent.filesList_update)
@@ -52,36 +51,12 @@ class DynamicTab(QWidget):
     """
     def fill_extension_combobox(self, list_of_files, all_supported_conversions):
         self.extQCB.clear()
-        possible_outputs = []
-        for input_file in list_of_files:
-            file_outputs = []
-            input_file_ext = utils.get_extension(input_file)
-            for conv in all_supported_conversions:
-                if input_file_ext in conv[0]:
-                    # append to possible_outputs only once per file
-                    file_outputs += conv[1]
-            possible_outputs.append(file_outputs)
-        # possible_outputs: list of lists of output formats, one per input file
-        # valid_outputs: list of outputs possible for ALL files
-        if len(list_of_files) > 1:
-            valid_outputs = []
-            for extension in sum(possible_outputs, []):
-                available = True
-                for i in possible_outputs:
-                    if extension not in i:
-                        available = False
-                        break
-                if available and extension not in valid_outputs:
-                    valid_outputs.append(extension)
-        else:
-            first_output_list = possible_outputs[0] if possible_outputs else []
-            valid_outputs = list(dict.fromkeys(first_output_list))
-
+        common = []
         if self.commonformatQChB.isChecked():
-            all_common = (self.parent.settings.value('extraformats_common') or []) + config.common_formats
-            # remove all uncommon formats from the list
-            valid_outputs[:] = [ext for ext in valid_outputs if ext in all_common]
-        self.extQCB.addItems(sorted(valid_outputs))
+            common = (self.parent.settings.value('extraformats_common') or []) + config.common_formats
+        outputs = utils.get_combobox_content(self, list_of_files, all_supported_conversions,
+                                             common=common)
+        self.extQCB.addItems(outputs)
 
     def ok_to_continue(self):
         return True

{ffconverter-2.2.2 → ffconverter-2.3.0}/ffconverter/ffconverter.py

@@ -1,4 +1,4 @@
-# Copyright (C) 2023 l-koehler
+# Copyright (C) 2023-2024 l-koehler
 # Copyright (C) 2011-2016 Ilias Stamatis <stamatis.iliass@gmail.com>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -20,6 +20,7 @@ import platform
 import textwrap
 import logging
 import webbrowser
+from threading import Thread
 
 from PyQt5.QtGui import QIcon, QKeySequence
 from PyQt5.QtCore import (
@@ -29,7 +30,7 @@ from PyQt5.QtCore import (
 from PyQt5.QtWidgets import (
         QAbstractItemView, QApplication, QCheckBox, QFileDialog, QLabel,
         QLineEdit, QMainWindow, QMessageBox, QPushButton, QShortcut, QTabWidget,
-        QToolButton, QWidget
+        QToolButton, QWidget, QComboBox
         )
 
 import ffconverter as ffmc
@@ -56,7 +57,90 @@ class MainWindow(QMainWindow):
         self.fnames = []  # list of file names to be converted
         self.office_listener_started = False
 
+        self.settings = QSettings()
+
+        mobile_ui = self.settings.value('mobile_ui', type=bool)
+
+        # needed by threaded_conversion_check, which we want to start
+        # as early as possible to save time on startup
+        if not mobile_ui:
+            self.dynamic_tab = DynamicTab(self)
+            self.audiovideo_tab = AudioVideoTab(self)
+            self.image_tab = ImageTab(self)
+            self.dependenciesQL = QLabel()
+        self.load_settings(self.settings)
+
+        def threaded_conversion_check(self):
+            self.check_for_dependencies()
+            return(utils.get_all_conversions(self.settings, missing=self.missing))
+        # Start a thread to get the conversions, join() it at the end of __init__
+        conversion_check_thread = utils.ThreadWithReturn(target=threaded_conversion_check, args=(self,))
+        conversion_check_thread.start()
+
         self.parse_cla()
+
+        self.setWindowTitle('FF-Converter')
+
+        openAction = utils.create_action(
+                self, self.tr('Open'), QKeySequence.Open, None,
+                self.tr('Open a file'), self.filesList_add
+                )
+        convertAction = utils.create_action(
+                self, self.tr('Convert'), 'Ctrl+C', None,
+                self.tr('Convert files'), self.start_conversion
+                )
+        quitAction = utils.create_action(
+                self, self.tr('Quit'), 'Ctrl+Q', None,
+                self.tr('Quit'), self.close
+                )
+        preferencesAction = utils.create_action(
+                self, self.tr('Preferences'), 'Alt+Ctrl+P',
+                None, self.tr('Preferences'), self.open_dialog_preferences
+                )
+
+        if mobile_ui:
+            # Mobile UI has less features, but is usable on devices
+            # with a smaller, vertical screen (Linux Phones)
+            self.name = "Mobile"
+            addQPB = QPushButton(self.tr('Add'))
+            clearQPB = QPushButton(self.tr('Clear'))
+            preferencesQPB = QPushButton(self.tr('Preferences'))
+            self.filesList = utils.FilesList()
+            self.filesList.setSelectionMode(QAbstractItemView.ExtendedSelection)
+            hlayout1 = utils.add_to_layout('h', addQPB, clearQPB, preferencesQPB, None)
+            vlayout1 = utils.add_to_layout('v', self.filesList, hlayout1)
+
+            outputQL = QLabel(self.tr('Output folder:'))
+            self.toQLE = QLineEdit()
+            self.toQLE.setReadOnly(True)
+            self.toQTB = QToolButton()
+            self.toQTB.setText('...')
+            hlayout2 = utils.add_to_layout('h', outputQL, self.toQLE, self.toQTB)
+
+            convertQL = QLabel(self.tr('Convert to:'))
+            self.extQCB = QComboBox()
+            hlayout3 = utils.add_to_layout('h', convertQL, self.extQCB)
+
+            convertQPB = QPushButton(self.tr('&Convert'))
+
+            self.filesList.dropped.connect(self.filesList_add_dragged)
+            addQPB.clicked.connect(self.filesList_add)
+            clearQPB.clicked.connect(self.filesList_clear)
+            self.toQTB.clicked.connect(self.get_output_folder)
+            convertQPB.clicked.connect(convertAction.triggered)
+            preferencesQPB.clicked.connect(preferencesAction.triggered)
+
+            final_layout = utils.add_to_layout('v', vlayout1, hlayout2,
+                                               hlayout3, convertQPB)
+
+            widget = QWidget()
+            widget.setLayout(final_layout)
+            self.setCentralWidget(widget)
+            # return early, full UI will not be created
+            conversion_check_thread.join()
+            self.all_supported_conversions = conversion_check_thread.result
+            return
+
         addQPB = QPushButton(self.tr('Add'))
         delQPB = QPushButton(self.tr('Delete'))
         clearQPB = QPushButton(self.tr('Clear'))
@@ -73,10 +157,6 @@ class MainWindow(QMainWindow):
         self.toQTB.setText('...')
         hlayout2 = utils.add_to_layout('h', outputQL, self.toQLE, self.toQTB)
 
-        self.dynamic_tab = DynamicTab(self)
-        self.audiovideo_tab = AudioVideoTab(self)
-        self.image_tab = ImageTab(self)
-
         self.tabs = [self.dynamic_tab, self.audiovideo_tab,
                      self.image_tab]
         tab_names = [self.tr('All Formats'), self.tr('Audio/Video Settings'),
@@ -97,25 +177,12 @@ class MainWindow(QMainWindow):
         final_layout = utils.add_to_layout(
                 'v', hlayout1, self.tabWidget, hlayout2, hlayout3, hlayout4)
 
-        self.dependenciesQL = QLabel()
         self.statusBar().addPermanentWidget(self.dependenciesQL, stretch=1)
 
         widget = QWidget()
         widget.setLayout(final_layout)
         self.setCentralWidget(widget)
 
-        openAction = utils.create_action(
-                self, self.tr('Open'), QKeySequence.Open, None,
-                self.tr('Open a file'), self.filesList_add
-                )
-        convertAction = utils.create_action(
-                self, self.tr('Convert'), 'Ctrl+C', None,
-                self.tr('Convert files'), self.start_conversion
-                )
-        quitAction = utils.create_action(
-                self, self.tr('Quit'), 'Ctrl+Q', None,
-                self.tr('Quit'), self.close
-                )
         edit_presetsAction = utils.create_action(
                 self, self.tr('Edit Presets'), 'Ctrl+P', None,
                 self.tr('Edit Presets'), self.open_dialog_presets
@@ -144,10 +211,6 @@ class MainWindow(QMainWindow):
                 self, self.tr('Clear All'), None, None,
                 self.tr('Clear form'), self.clear_all
                 )
-        preferencesAction = utils.create_action(
-                self, self.tr('Preferences'), 'Alt+Ctrl+P',
-                None, self.tr('Preferences'), self.open_dialog_preferences
-                )
         trackerAction = utils.create_action(
                 self, 'Issue tracker', None, None, None,
                 lambda: webbrowser.open(
@@ -208,16 +271,14 @@ class MainWindow(QMainWindow):
         del_shortcut.setKey(Qt.Key_Delete)
         del_shortcut.activated.connect(self.filesList_delete)
 
-        self.setWindowTitle('Multi-Converter')
-
-        self.settings = self.load_settings()
-        self.missing = self.check_for_dependencies()
-
         self.audiovideo_tab.set_default_command()
         self.image_tab.set_default_command()
         self.toQLE.setText(self.default_output)
 
-        self.all_supported_conversions = utils.get_all_conversions(self.settings, missing=self.missing)
+        # get all supported conversions from the thread started before the UI creation
+        # most of the time is still spent waiting for the thread
+        conversion_check_thread.join()
+        self.all_supported_conversions = conversion_check_thread.result
 
         self.filesList_update()
 
@@ -236,6 +297,7 @@ class MainWindow(QMainWindow):
         update self.dependenciesQL with the appropriate message.
         """
         use_wsl = self.settings.value('use_wsl', type=bool)
+        mobile_ui = self.settings.value('mobile_ui', type=bool)
         if not utils.is_installed(self.ffmpeg_path, use_wsl):
             self.ffmpeg_path = utils.is_installed('ffmpeg', use_wsl)
             QSettings().setValue('ffmpeg_path', self.ffmpeg_path)
@@ -251,39 +313,41 @@ class MainWindow(QMainWindow):
         self.compress_gzip = utils.is_installed('gzip', use_wsl)
         self.compress_bzip2 = utils.is_installed('bzip2', use_wsl)
 
-        missing = []
+        self.missing = []
         if not self.ffmpeg_path:
-            missing.append('ffmpeg')
+            self.missing.append('ffmpeg')
         if not self.unoconv:
-            missing.append('unoconv')
+            self.missing.append('unoconv')
         if not self.imagemagick:
-            missing.append('imagemagick')
+            self.missing.append('imagemagick')
         if not self.pandoc:
-            missing.append('pandoc')
+            self.missing.append('pandoc')
         if not self.compress_zip:
-            missing.append('zip')
+            self.missing.append('zip')
         if not self.compress_unzip:
-            missing.append('unzip')
+            self.missing.append('unzip')
         if not self.compress_tar:
-            missing.append('tar')
+            self.missing.append('tar')
         if not self.compress_squash:
-            missing.append('squashfs-tools')
+            self.missing.append('squashfs-tools')
         if not self.compress_ar:
-            missing.append('binutils/ar')
+            self.missing.append('binutils/ar')
         if not self.compress_gzip:
-            missing.append('gzip')
+            self.missing.append('gzip')
         if not self.compress_bzip2:
-            missing.append('bzip2')
+            self.missing.append('bzip2')
 
-        if missing:
-            missing = ', '.join(missing)
-            status = self.tr('Missing dependencies:') + ' ' + missing
-            self.dependenciesQL.setText(status)
-        return missing
+        if self.missing:
+            self.missing = ', '.join(self.missing)
+            status = self.tr('Missing dependencies:') + ' ' + self.missing
+            if mobile_ui:
+                print(status)
+            else:
+                self.dependenciesQL.setText(status)
 
-    def load_settings(self):
-        settings = QSettings()
+    def load_settings(self, settings):
 
+        self.mobile_ui = settings.value('mobile_ui', type=bool)
         self.overwrite_existing = settings.value('overwrite_existing', type=bool)
         self.default_output = settings.value('default_output', type=str)
         self.prefix = settings.value('prefix', type=str)
@@ -295,9 +359,6 @@ class MainWindow(QMainWindow):
         extraformats_video = (settings.value('extraformats_video') or [])
         videocodecs = (settings.value('videocodecs') or config.video_codecs)
         audiocodecs = (settings.value('audiocodecs') or config.audio_codecs)
-        self.default_command_image = (settings.value('default_command_image',
-                type=str) or
-                config.default_imagemagick_cmd)
         extraformats_image = (settings.value('extraformats_image') or [])
         extraformats_document = (settings.value('extraformats_document') or [])
         extraformats_markdown = (settings.value('extraformats_markdown') or [])
@@ -306,12 +367,15 @@ class MainWindow(QMainWindow):
         extraformats_common = (settings.value('extraformats_common') or [])
         extraformats_double = (settings.value('extraformats_double') or [])
 
-        self.audiovideo_tab.fill_video_comboboxes(videocodecs,
+        if not self.mobile_ui:
+            self.audiovideo_tab.fill_video_comboboxes(videocodecs,
                 audiocodecs, extraformats_video)
-        self.image_tab.fill_extension_combobox(extraformats_image)
-        
+            self.image_tab.fill_extension_combobox(extraformats_image)
+            self.default_command_image = (settings.value('default_command_image',
+                type=str) or config.default_imagemagick_cmd)
+
         return settings
-        
+
     def get_current_tab(self):
         for i in self.tabs:
             if self.tabs.index(i) == self.tabWidget.currentIndex():
@@ -321,16 +385,24 @@ class MainWindow(QMainWindow):
         self.filesList.clear()
         for i in self.fnames:
             self.filesList.addItem(i)
-        # update dynamic tab
-        # dynamic_tab takes not extra formats, but a list of all files added
-        self.dynamic_tab.fill_extension_combobox(self.fnames, self.all_supported_conversions)
+        if self.mobile_ui:
+            # update mobile UI combobox
+            self.extQCB.clear()
+            outputs = utils.get_combobox_content(self, self.fnames,
+                                                 self.all_supported_conversions, [])
+            self.extQCB.addItems(outputs)
+        else:
+            # update dynamic tab
+            # dynamic_tab takes not extra formats, but a list of all files added
+            self.dynamic_tab.fill_extension_combobox(self.fnames, self.all_supported_conversions)
 
     def filesList_add(self):
         filters  = 'All Files (*);;'
-        filters += 'Audio/Video Files (*.{});;'.format(
-                ' *.'.join(self.audiovideo_tab.formats))
-        filters += 'Image Files (*.{});;'.format(
-                ' *.'.join(self.image_tab.formats + self.image_tab.extra_img))
+        if not self.mobile_ui:
+            filters += 'Audio/Video Files (*.{});;'.format(
+                    ' *.'.join(self.audiovideo_tab.formats))
+            filters += 'Image Files (*.{});;'.format(
+                    ' *.'.join(self.image_tab.formats + self.image_tab.extra_img))
 
         fnames = QFileDialog.getOpenFileNames(self, 'FF Multi Converter - ' +
                 self.tr('Choose File'), config.home, filters,
@@ -413,17 +485,23 @@ class MainWindow(QMainWindow):
 
         Return False if an error arises, else True.
         """
+        if self.mobile_ui:
+            origQCB_status = False
+            tab_ok = True
+        else:
+            origQCB_status = self.origQCB.isChecked()
+            tab_ok = self.get_current_tab().ok_to_continue()
         try:
             if not self.fnames:
                 raise ValidationError(
                         self.tr('You must add at least one file to convert!'))
-            elif not self.origQCB.isChecked() and not self.toQLE.text():
+            elif not origQCB_status and not self.toQLE.text():
                 raise ValidationError(
                         self.tr('You must choose an output folder!'))
-            elif (not self.origQCB.isChecked() and
+            elif (not origQCB_status and
                   not os.path.exists(self.toQLE.text())):
                 raise ValidationError(self.tr('Output folder does not exists!'))
-            if not self.get_current_tab().ok_to_continue():
+            if not tab_ok:
                 return False
             return True
 
@@ -440,28 +518,39 @@ class MainWindow(QMainWindow):
         if not self.ok_to_continue():
             return
 
-        tab = self.get_current_tab()
+        if self.mobile_ui:
+            tab = self
+        else:
+            tab = self.get_current_tab()
         ext_to = '.' + tab.extQCB.currentText()
 
         if tab.name == 'All Formats' and not self.office_listener_started:
             utils.start_office_listener()
             self.office_listener_started = True
 
-        _list = utils.create_paths_list(
-                self.fnames, ext_to, self.prefix, self.suffix,
-                self.toQLE.text(), self.origQCB.isChecked(),
-                self.overwrite_existing
-                )
+        if self.mobile_ui:
+            _list = utils.create_paths_list(
+                    self.fnames, ext_to, self.prefix, self.suffix,
+                    self.toQLE.text(), False, self.overwrite_existing
+                    )
+            dialog = progress.Progress(
+                    _list, tab, False, self)
+        else:
+            _list = utils.create_paths_list(
+                    self.fnames, ext_to, self.prefix, self.suffix,
+                    self.toQLE.text(), self.origQCB.isChecked(),
+                    self.overwrite_existing
+                    )
+            dialog = progress.Progress(
+                    _list, tab, self.deleteQCB.isChecked(), self)
 
-        dialog = progress.Progress(
-                _list, tab, self.deleteQCB.isChecked(), self)
         dialog.show()
 
     def open_dialog_preferences(self):
         """Open the preferences dialog."""
         dialog = preferences_dlg.Preferences(self)
         if dialog.exec_():
-            self.load_settings()
+            self.load_settings(self.settings)
 
     def open_dialog_presets(self):
         """Open the presets dialog."""

{ffconverter-2.2.2 → ffconverter-2.3.0}/ffconverter/preferences_dlg.py

@@ -20,7 +20,7 @@ from PyQt5.QtCore import QSettings, QTimer
 from PyQt5.QtWidgets import (
         QDialog, QDialogButtonBox, QFileDialog, QLabel, QLineEdit,
         QRadioButton, QSpacerItem, QTabWidget, QToolButton, QWidget,
-        QPlainTextEdit, QPushButton, QCheckBox
+        QPlainTextEdit, QPushButton, QCheckBox, QMessageBox
         )
 
 from ffconverter import utils
@@ -67,11 +67,12 @@ class Preferences(QDialog):
                 [self.commonformatsQPTE, self.doubleformatsQPTE])
         other_layout = utils.add_to_layout('h', other_grid, None)
 
+        self.mobile_uiQChB = QCheckBox(self.tr("Use (smaller) mobile UI"))
         if os.name == 'nt':
             self.use_wslQChB = QCheckBox(self.tr("Windows: Use WSL for conversions"))
-            use_wslGrid = utils.add_to_grid([self.use_wslQChB])
+            other_optionsGrid = utils.add_to_grid([self.use_wslQChB],[self.mobile_uiQChB])
         else:
-            use_wslGrid = None
+            other_optionsGrid = utils.add_to_grid([self.mobile_uiQChB])
 
         tabwidget1_layout = utils.add_to_layout(
                 'v', saveQL,
@@ -81,7 +82,7 @@ class Preferences(QDialog):
                 QSpacerItem(14, 13), prefix_layout,
                 QSpacerItem(14, 13), otherQL,
                 QSpacerItem(14, 13), other_layout,
-                QSpacerItem(14, 13), use_wslGrid
+                QSpacerItem(14, 13), other_optionsGrid,
                 )
 
         ffmpegQL = QLabel('<html><b>FFmpeg</b></html>')
@@ -195,6 +196,7 @@ class Preferences(QDialog):
     def load_settings(self):
         """Load settings and update graphical widgets with loaded values."""
         settings = QSettings()
+        mobile_ui = settings.value('mobile_ui', type=bool)
         overwrite_existing = settings.value('overwrite_existing', type=bool)
         default_output = settings.value('default_output', type=str)
         prefix = settings.value('prefix', type=str)
@@ -219,6 +221,10 @@ class Preferences(QDialog):
             self.exst_overwriteQRB.setChecked(True)
         else:
             self.exst_prefixQRB.setChecked(True)
+        if mobile_ui:
+            self.mobile_uiQChB.setChecked(True)
+        else:
+            self.mobile_uiQChB.setChecked
 
         self.defaultQLE.setText(default_output)
         self.prefixQLE.setText(prefix)
@@ -272,6 +278,9 @@ class Preferences(QDialog):
     def save_settings(self):
         """Set settings values by extracting the appropriate information from
         the graphical widgets."""
+        # set this to true if something that requires a restart was changed
+        ui_change = False
+
         videocodecs = self.plaintext_to_list(self.vidcodecsQPTE)
         audiocodecs = self.plaintext_to_list(self.audcodecsQPTE)
         extraformats_video = self.plaintext_to_list(self.extraformatsffmpegQPTE,
@@ -298,6 +307,11 @@ class Preferences(QDialog):
         if not utils.is_installed(ffmpeg_path, use_wsl):
             ffmpeg_path = utils.is_installed('ffmpeg', use_wsl)
 
+        # check if the UI was changed
+        if settings.value('mobile_ui', type=bool) != self.mobile_uiQChB.isChecked():
+            ui_change = True
+
+        settings.setValue('mobile_ui', self.mobile_uiQChB.isChecked())
         settings.setValue('overwrite_existing', self.exst_overwriteQRB.isChecked())
         settings.setValue('default_output', self.defaultQLE.text())
         settings.setValue('prefix', self.prefixQLE.text())
@@ -315,4 +329,16 @@ class Preferences(QDialog):
         settings.setValue('extraformats_double', sorted(extraformats_double))
         settings.setValue('use_wsl', use_wsl)
 
-        self.accept()
+        if ui_change:
+            ret = QMessageBox.question(self,'',
+                self.tr("The changed settings require a program restart. Close Program?"),
+                QMessageBox.Yes | QMessageBox.No)
+            if ret == QMessageBox.Yes:
+                self.accept()
+                exit(0)
+            else:
+                # reset changes to mobile_ui and mobile_uiQChB
+                settings.setValue('mobile_ui', not self.mobile_uiQChB.isChecked())
+                self.mobile_uiQChB.setChecked(not self.mobile_uiQChB.isChecked())
+        else:
+            self.accept()

{ffconverter-2.2.2 → ffconverter-2.3.0}/ffconverter/progress.py

@@ -174,7 +174,7 @@ class Progress(QDialog):
             self.cancelQPB.setText(self.tr("Close"))
 
             if self.shutdownQCB.isChecked():
-                # Locating systemctl in WSL would be pointless
+                # Locating systemctl in WSL would be pointless, use_wsl is False
                 if utils.is_installed('systemctl', False):
                     subprocess.call(shlex.split('systemctl poweroff'))
                 else:

{ffconverter-2.2.2 → ffconverter-2.3.0}/ffconverter/utils.py

@@ -25,6 +25,7 @@ import shlex
 import subprocess
 import time
 import string
+import threading
 
 from PyQt5.QtCore import pyqtSignal, QSize, Qt, QSettings
 from PyQt5.QtWidgets import (
@@ -33,6 +34,11 @@ from PyQt5.QtWidgets import (
         )
 from ffconverter import config
 
+class ThreadWithReturn(threading.Thread):
+    def __init__(self, group=None, target=None, name=None, args=(), kwargs={}, *, daemon=None):
+        def function():
+            self.result = target(*args, **kwargs)
+        super().__init__(group=group, target=function, name=name, daemon=daemon)
 
 def duration_in_seconds(duration):
     """
@@ -64,7 +70,8 @@ def is_installed(program, use_wsl):
             if os.path.isfile(fpath) and os.access(fpath, os.X_OK):
                 return fpath
     # imagemagick 6 uses 'convert', version 7 uses 'magick'
-    if program == 'magick':
+    # 'convert' is reserved for fat-to-ntfs conversion in windows
+    if program == 'magick' and os.name != 'nt':
         return is_installed('convert', use_wsl)
 
     # only if nothing was found on the regular system, check WSL
@@ -165,7 +172,7 @@ def get_all_conversions(settings, get_conv_for_ext = False,
         supported_tmp.append(ffmpeg_conversions)
     else:
         ffmpeg_conversions = [[], []]
-    
+
     # poll pandoc
     if 'pandoc' not in missing:
         extraformats_markdown = (settings.value('extraformats_markdown') or [])
@@ -224,7 +231,7 @@ def get_all_conversions(settings, get_conv_for_ext = False,
         supported_tmp.append(magick_conversions)
     else:
         magick_conversions = [[], []]
-    
+
     # libreoffice exts
     # cant actually get those right now, so have some predefined lists instead
     if 'unoconv' not in missing:
@@ -319,7 +326,7 @@ def get_extension(file_path):
 
     # if there are quotation marks around the file path, remove them
     settings = QSettings()
-    
+
     file_path = file_path.replace("\"", "")
 
     remainder, first_ext = os.path.splitext(file_path)
@@ -332,6 +339,39 @@ def get_extension(file_path):
         return joined_ext
     return first_ext
 
+def get_combobox_content(self, list_of_files, all_supported_conversions,
+                         common=[]):
+    possible_outputs = []
+    for input_file in list_of_files:
+        file_outputs = []
+        input_file_ext = get_extension(input_file)
+        for conv in all_supported_conversions:
+            if input_file_ext in conv[0]:
+                # append to possible_outputs only once per file
+                file_outputs += conv[1]
+        possible_outputs.append(file_outputs)
+    # possible_outputs: list of lists of output formats, one per input file
+    # valid_outputs: list of outputs possible for ALL files
+    if len(list_of_files) > 1:
+        valid_outputs = []
+        for extension in sum(possible_outputs, []):
+            available = True
+            for i in possible_outputs:
+                if extension not in i:
+                    available = False
+                    break
+            if available and extension not in valid_outputs:
+                valid_outputs.append(extension)
+    else:
+        # flatten and deduplicate
+        first_output_list = possible_outputs[0] if possible_outputs else []
+        valid_outputs = list(dict.fromkeys(first_output_list))
+
+    if common != []:
+        # remove all uncommon formats from the list
+        valid_outputs[:] = [ext for ext in valid_outputs if ext in common]
+    return valid_outputs
+
 def start_office_listener():
     """
     Start a openoffice/libreoffice listener.

{ffconverter-2.2.2 → ffconverter-2.3.0}/ffconverter.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ffconverter
-Version: 2.2.2
+Version: 2.3.0
 Summary: File Format Converter with Qt GUI
 Home-page: https://github.com/l-koehler/FF-converter
 Author: Ilias Stamatis

{ffconverter-2.2.2 → ffconverter-2.3.0}/share/ffconverter.desktop

@@ -1,7 +1,7 @@
 #!/usr/bin/env xdg-open
 [Desktop Entry]
 Type=Application
-Version=2.2.0
+Version=2.3.0
 Name=FF Converter
 GenericName=File Format Converter
 GenericName[pt]=Conversor de ficheiros