Merge pull request #40 from Lich-Corals/dev

Various improvements for the adaption

Author: Lich-Corals

markdown/configuration.md

@@ -10,24 +10,27 @@ nautilus -q
 #start it again, you can also use the normal launcher.
 nohup nautilus & disown
 ```
-## 3.1 Automatic updates
+## Automatic updates
 Automatic updates are only working in the home dictionary. If you've installed the script at the system-wide location, you may turn off automatic updates.
 <br/><br/>To <b>turn off automatic updates</b>, open the config file with a text editor and set the `automaticUpdates` variable to 'false'.
 To <b>manually trigger a self-update</b>, just open the .py file with a text editor and change the value of the `converterVersion` variable.
 To turn off the <b>update pop-up</b>, open the config file with a text editor and set the `showPatchNotes` variable to 'false'.
 
-## 3.2 Shown menu items
-To turn off the <b>patch note button</b> in the context menu, open the config file with a text editor and set the `showPatchNoteButton` variable to 'false'.
-<br/><br/>To turn off the <b>Configure NFC43 button</b> in the context menu, open the config file with a text editor and set the `showConfigHint` variable to 'false'.
-Note: This option is not available in Nemo so far.
+## Shown menu items
+To turn off the <b>patch note button</b> in the context menu and the <b>version number</b> in the adaption window, open the config file with a text editor and set the `showPatchNoteButton` variable to 'false'.
+<br/><br/>To turn off the <b>Configure NFC43 button</b> in the context menu and the <b>config hint</b> in the adaption window, open the config file with a text editor and set the `showConfigHint` variable to 'false'.
 <br/><br/>To turn off the '<b>convert to square</b>' option, open the config file with a text editor and set the `convertToSquares` variable to 'false'.
 <br/><br/>To turn off the '<b>convert to wallpaper</b>' function, open the config file with a text editor and set the `convertToWallpapers` variable to 'false'.
 
-## 3.3 Other options
+## Other options
 <br/>To turn off the <b>Double script installation Warning</b>, open the config file with a text editor and set the `checkForDoubleInstallation` variable to 'false'.
 Note: This option may be a bit buggy in Nemo, I'll fix it in the future if it appears to be annoying to some users.
 <br/>To turn off the __addition of timestamps__ to filenames, open the config file with a text editor and set the `timeInNames` variable to ‘false’.
 
+## Adaption specific options (Nemo)
+<br/>To enable the conversion of <b>application/octet-stream</b> files in the adaption version, set the `convertFromOctetStream` option to 'true'. This may allow you to convert files with unmatching mimetypes, which are in a supported- but not as such detected format. This may also allow the context menu option for other un-convertabe files, such a pdf or zip.
+<br/>To disable the <b>"-" option</b> in the dropdown-list, set the `showDummyOption` setting to 'false'.
+
 #### All sections
 - [Main page](https://github.com/Lich-Corals/linux-file-converter-addon/blob/main/README.md)
 - __[Configuration](https://github.com/Lich-Corals/linux-file-converter-addon/blob/main/markdown/configuration.md)__

nautilus-fileconverter.py

@@ -1,7 +1,7 @@
 #! /usr/bin/python3 -OOt
 
 # --- Version number ---
-converterVersion = "001002009" # Change the number if you want to trigger an update.
+converterVersion = "001002010" # Change the number if you want to trigger an update.
 
 # --- Imports ---
 import gi
@@ -73,15 +73,17 @@
     print(f"WARNING(Nautilus-file-converter)(004): No permission to write configuration file; \"{currentPath}\" is not writeable. View https://github.com/Lich-Corals/linux-file-converter-addon/blob/main/markdown/errors-and-warnings.md for more information.")
 
 # --- Set default configs ---
-_configPreset = {                                 # These are the pre-defined default settings; edit NFC43-Config.json if the program is installed in your home dictionary.
-    "automaticUpdates": True,               # Replace the "True" with "False" if you don't want automatic updates.
-    "showPatchNotes": True,                 # Replace the "True" with "False" if you don't want to see patch notes.
-    "showPatchNoteButton": True,            # Replace the "True" with "False" if you don't want the "View patch notes" button in the converter menu.
-    "showConfigHint": True,                 # Replace the "True" with "False" if you don't want to see the config hint.
-    "convertToSquares": True,               # Replace the "True" with "False" if you don't want to convert to square formats.
-    "convertToWallpapers": True,            # Replace the "True" with "False" if you don't want to convert to wallpaper formats.
-    "checkForDoubleInstallation": True,     # Replace the "True" with "False" if you don't the script to check if there is a second installation in another dictionary.
-    "timeInNames": True                     # Replace the "True" with "False" if you don't want the script to rename the files to contain a timestamp.
+_configPreset = {                                 # These are the pre-defined default settings; edit NFC43-Config.json if the program has permission to write.
+    "automaticUpdates": True,
+    "showPatchNotes": True,
+    "showPatchNoteButton": True,
+    "showConfigHint": True,
+    "convertToSquares": True,
+    "convertToWallpapers": True,
+    "checkForDoubleInstallation": True,
+    "timeInNames": True,
+    "convertFromOctetStream": False,
+    "showDummyOption": True
 }
 
 # --- Load or store configs json ---
@@ -143,7 +145,6 @@
                       'video/fli',
                       'image/vnd.fpx',
                       'image/vnd.net-fpx',
-#                      'application/octet-stream', <-- Didn't make any problems in nautilus, but Nemo takes all files in it (.zip, .doc, .pdf, etc.) instead of only the image types.
                       'windows/metafile',
                       'image/x-xpixmap',
                       'image/webp')
@@ -185,6 +186,8 @@
                       'video/x-msvideo',
                       'video/quicktime')
 
+octetStreamFormats = ('application/octet-stream',)
+
 WRITE_FORMATS_IMAGE = [{'name': 'PNG'},
                        {'name': 'JPEG'},
                        {'name': 'BMP'},
@@ -243,6 +246,9 @@
                        {'name': 'MP3'},
                        {'name': 'WAV'}]
 
+if _config["convertFromOctetStream"]:
+    READ_FORMATS_IMAGE = READ_FORMATS_IMAGE + octetStreamFormats
+
 if pillow_heifInstalled:
     READ_FORMATS_IMAGE = READ_FORMATS_IMAGE + pyheifReadFormats
 
@@ -305,14 +311,21 @@ def convert_ffmpeg(menu, format, files):
 # --- Nemo adaption ---
 class nautilusFileConverterPopup(Gtk.Window):
     def __init__(self):
-        super().__init__(title="Convert file")
+        super().__init__(title=f"Convert file")
         self.set_border_width(15)
         self.set_default_size(200, 20)
 
         vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6)
 
         label = Gtk.Label(label="Select a format:")
+        label.set_justify(Gtk.Justification.CENTER)
         vbox.pack_start(label, False, False, 0)
+        versionInfo = Gtk.Label()
+        versionInfo.set_markup(f"""<span size="x-small">version {converterVersion}</span>""")
+        versionInfo.set_justify(Gtk.Justification.CENTER)
+        configHint = Gtk.Label()
+        configHint.set_justify(Gtk.Justification.CENTER)
+        configHint.set_markup(f"""<span size="x-small">View <a href="https://github.com/Lich-Corals/linux-file-converter-addon/blob/main/markdown/configuration.md">the config documentation</a>\nto configure the script and hide this text.</span>""")
 
         extensions = Gtk.ListStore(str, str, int)
         _allImages = True
@@ -326,6 +339,9 @@ def __init__(self):
             if not mime.from_file(_arg) in READ_FORMATS_VIDEO:
                 _allVideos = False
 
+        if _config["showDummyOption"]:
+            extensions.append(["-", "none", 2])
+
         if _allImages:
             for writeFormat in WRITE_FORMATS_IMAGE:
                 print(writeFormat)
@@ -351,22 +367,27 @@ def __init__(self):
         combo.add_attribute(renderer_text, "text", 0)
         combo.connect("changed", self._nemoConvert)
         vbox.pack_start(combo, False, False, 0)
+        if _config["showPatchNoteButton"]:
+            vbox.pack_start(versionInfo, False, False, 0)
+        if _config["showConfigHint"]:
+            vbox.pack_start(configHint, True, True, 0)
 
     def _nemoConvert(self, combo):
-        self.hide()
         tree_iter = combo.get_active_iter()
         if tree_iter is not None:
             model = combo.get_model()
             return_name, return_format, return_type = model[tree_iter][:4]
             print(return_name, return_format, return_type)
             return_format = ast.literal_eval(return_format)
             return_paths = []
-            for retun_path in _nemoArgs:
-                return_paths.append(Path(retun_path))
-            if return_type == 0:
-                convert_image(self, return_format, return_paths)
-            elif return_type == 1:
-                convert_ffmpeg(self, return_format, return_paths)
+            if not return_type == 2:
+                self.hide()
+                for retun_path in _nemoArgs:
+                    return_paths.append(Path(retun_path))
+                if return_type == 0:
+                    convert_image(self, return_format, return_paths)
+                elif return_type == 1:
+                    convert_ffmpeg(self, return_format, return_paths)
 
 
 _nemoArgs = sys.argv[1:len(sys.argv)]
@@ -402,7 +423,7 @@ def get_file_items(self, *args) -> List[Nautilus.MenuItem]:
         for file in files:
             print(file.get_mime_type())
             file_mime = file.get_mime_type()
-            if file_mime in READ_FORMATS_IMAGE:
+            if file_mime in READ_FORMATS_IMAGE or file_mime == 'application/octet-stream':
                 return self.__submenu_builder(WRITE_FORMATS_IMAGE,
                                               callback=convert_image,
                                               files=files)