No processing option #112 - no convert config added

Author: MikeGawi

INSTALL.md

@@ -9,6 +9,7 @@
 	  	* [Local Source](#local-source)
 			* [Cloud sync](#cloud-sync)		
 			* [Other sources](#other-sources)		
+			* [Pre-process photos](#pre-process-photos)		
 	  	* [Google Photos](#google-photos)
 			* [Activate from ePiframe device](#activate-from-epiframe-device)
 			* [Activate from other device](#activate-from-other-device)
@@ -150,6 +151,10 @@ It is possible to download photos to a local storage (and use them by ePiframe)
 * [gallery-dl](https://github.com/mikf/gallery-dl) - a command-line program to download image galleries and collections from DeviantArt, Flickr, Instagram, Pinterest and many more
 * [iCloud Photos Downloader](https://github.com/icloud-photos-downloader/icloud_photos_downloader) - a command-line tool to download all your iCloud photos
 
+### Pre-process photos
+
+If you want photos to be pre-processed and ready for display in the frame (to save resources during conversion or to convert them earlier, on another device), this is possible using the `--convert` option command in [ePiframe commands](#command-line) and disabling conversion in [*config.cfg*](https://github.com/MikeGawi/ePiframe/blob/master/config.cfg) by switching the `convert` flag off.
+
 ## Google Photos
 
 ePiframe needs to have credentials and *access token* to access Google Photos of Google account in an unsupervised way when Google Photos source is enabled in the configuration. For this You need to activate Google Photos API for the account used by ePiframe and configure application in Google Cloud Console.

config.cfg

@@ -211,6 +211,12 @@ allow_triggers=1
 
 [Image]
 
+# Convert before displaying.
+# If disabled, then You must have your photos pre-converted via the ePiframe command line!
+# Command line actions will always work.
+# Default: 1
+convert=1
+
 # Used for e-Paper SPI _black&white_ displays!
 # There are 6 standard types of conversion to black&white image (add more in
 # convertmanager module). Every option gives slightly different

ePiframe.py

@@ -7,6 +7,8 @@
 import signal
 import sys
 from datetime import datetime
+from typing import List
+
 import pandas
 import starlette.status
 from pandas import DataFrame
@@ -627,7 +629,12 @@ def process_file(
         self.logging.log("Success!")
         self.interval_multiplication(filename, photo)
         self.save_index()
-        self.convert_file(filename, photo)
+        if bool(self.config.getint("convert")):
+            self.convert_file(filename, photo)
+        else:
+            self.logging.log(
+                "Conversion disabled in config by 'config' flag! Make sure your photos are pre-converted!"
+            )
 
     def save_index(self):
         # save index of current photo for next run
@@ -662,13 +669,9 @@ def save_pid(self):
             raise
 
     def check_system(self):
-        if (
-            not self.check_arguments("--test")
-            and not self.check_arguments("--test-convert")
-            and not self.check_arguments("--convert")
-            and not self.check_arguments("--no-skip")
-            and not DisplayManager.is_hdmi(self.config.get("display_type"))
-        ):
+        if not self.check_multiple_arguments(
+            ["--test", "--test-convert", "--convert", "--no-skip"]
+        ) and not DisplayManager.is_hdmi(self.config.get("display_type")):
             self.process_check_system()
 
     def process_check_system(self):
@@ -734,6 +737,13 @@ def show_help(self):
 
             sys.exit(0)
 
+    @staticmethod
+    def check_multiple_arguments(names: List[str]) -> bool:
+        return_value = False
+        for name in names:
+            return_value = return_value or EPiframe.check_arguments(name)
+        return return_value
+
     @staticmethod
     def check_arguments(name: str) -> bool:
         return name in [argument.lower() for argument in sys.argv]

misc/config.default

@@ -211,6 +211,12 @@ allow_triggers=1
 
 [Image]
 
+# Convert before displaying.
+# If disabled, then You must have your photos pre-converted via the ePiframe command line!
+# Command line actions will always work.
+# Default: 1
+convert=1
+
 # Used for e-Paper SPI _black&white_ displays!
 # There are 6 standard types of conversion to black&white image (add more in
 # convertmanager module). Every option gives slightly different

modules/configmanager.py

@@ -63,6 +63,7 @@ def load_settings(self):
             ConfigProperty(
                 "photo_convert_path", self, prop_type=ConfigProperty.FILE_TYPE
             ),
+            ConfigProperty("convert", self, prop_type=ConfigProperty.BOOLEAN_TYPE),
             ConfigProperty("log_files", self, not_empty=False),
             ConfigProperty(
                 "convert_bin_path", self, prop_type=ConfigProperty.FILE_TYPE

modules/convertmanager.py

@@ -125,9 +125,7 @@ def __convert_option(
         width = config.getint("image_width")
         height = config.getint("image_height")
         back = config.get("background_color")
-
-        if int(option) > len(self.__CONVERT_OPTIONS) or int(option) < 1:
-            option = 1
+        option = self.__get_option(option)
 
         # space at the end as those flag are optional
         negate = self.__INVERT_FLAG if config.getint("invert_colors") == 1 else ""
@@ -167,6 +165,13 @@ def __convert_option(
         print(return_value.replace("(", "\(").replace(")", "\)"))
         return return_value
 
+    def __get_option(self, option: int) -> int:
+        return (
+            1
+            if int(option) > len(self.__CONVERT_OPTIONS) or int(option) < 1
+            else option
+        )
+
     def __get_background(self, back, height, original_height, original_width, width):
         if back == Constants.BACK_PHOTO:
             back = Constants.BACK_WHITE