From c16631e676838b27861a9dd63fcd43248be7b529 Mon Sep 17 00:00:00 2001 From: Ville Rantanen Date: Thu, 26 Aug 2021 09:37:19 +0300 Subject: [PATCH 1/3] added EXIF tagging --- mirva/__init__.py | 2 +- mirva/mirva.py | 95 +++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 80 insertions(+), 17 deletions(-) diff --git a/mirva/__init__.py b/mirva/__init__.py index 617c9f3..f95b5a7 100644 --- a/mirva/__init__.py +++ b/mirva/__init__.py @@ -1,4 +1,4 @@ -__version__ = "20210821.0" +__version__ = "20210826.0" def get_version(): diff --git a/mirva/mirva.py b/mirva/mirva.py index 1401c4f..24a85c7 100755 --- a/mirva/mirva.py +++ b/mirva/mirva.py @@ -16,6 +16,7 @@ class Mirva: ) self.resource_dir = ".mirva" self.config_file = os.path.join(self.resource_dir, "config.cfg") + self.config_backup = os.path.join(self.resource_dir, "config.cfg.bkp") self.get_options() os.chdir(self.options.folder) self.write_resources() @@ -24,8 +25,9 @@ class Mirva: self.create_config() print("Config created: Exiting without gallery creation. Check config first.") return - self.create_config() self.get_config() + if self.options.exif: + self.append_exif() self.create_posts() self.write_index() self.write_mediums() @@ -33,11 +35,11 @@ class Mirva: def create_config(self): - config = configparser.ConfigParser() - config.read(self.config_file) + self.config = configparser.ConfigParser() + self.config.read(self.config_file) config_changed = False - if not "SITE" in config: - config["SITE"] = { + if not "SITE" in self.config: + self.config["SITE"] = { "title": "", "sub_title": "", "intro": "", @@ -46,20 +48,14 @@ class Mirva: config_changed = True for f in self.file_list: - if not f in config: + if not f in self.config: title, _ = os.path.splitext(f) title = title.replace("_", " ") - config[f] = {"title": title, "description": ""} + self.config[f] = {"title": title, "description": ""} config_changed = True if config_changed: - print( - "Modified config: {}".format( - os.path.join(self.options.folder, self.config_file) - ) - ) - with open(self.config_file, "wt") as fp: - config.write(fp) + self.write_config() def create_posts(self): @@ -75,6 +71,21 @@ class Mirva: self.config = configparser.ConfigParser() self.config.read(self.config_file) + def write_config(self): + print( + "Modified config: {}".format( + os.path.join(self.options.folder, self.config_file) + ) + ) + if os.path.exists(self.config_file): + with open(self.config_file, "rt") as reader: + with open(self.config_backup, "wt") as writer: + writer.write(reader.read()) + + with open(self.config_file, "wt") as fp: + self.config.write(fp) + + def get_files(self): image_match = re.compile(".*\.jpg$|.*\.jpeg$|.*\.png$|.*\.gif$|.*\.tif$", re.I) files = [] @@ -95,7 +106,7 @@ class Mirva: ) # parser.add_argument("-v", default=False, action="store_true") parser.add_argument( - "--config", default=False, action="store_true", help="Write config and exit" + "--config", default=False, action="store_true", help="Write config and exit. Required if more images are added." ) parser.add_argument( "--force", @@ -103,6 +114,12 @@ class Mirva: action="store_true", help="Force regeneration of middle sized images", ) + parser.add_argument( + "--exif", + default=False, + action="store_true", + help="Append EXIF information to image descriptions", + ) parser.add_argument( "--version", action="version", @@ -317,4 +334,50 @@ function create_button(direction, to) {{ ] sys.stdout.write(".") sys.stdout.flush() - subprocess.call(convargs) + subprocess.run(convargs) + sys.stdout.write("\n") + + def append_exif(self): + exif_format = ''' + + ''' + + for f in self.config: + if f in self.file_list: + sys.stdout.write(".") + sys.stdout.flush() + file_size = human_size(f) + p = subprocess.run( + ['identify','-format',exif_format.format(size=file_size),"{}[0]".format(f)], + capture_output = True + ) + + self.config[f]['description'] += p.stdout.decode('utf-8') + sys.stdout.write("\n") + self.write_config() + + + +def human_size(file_name, precision=1): + size = os.path.getsize(file_name) + + if size == None: + return "nan" + sign = "" + if size < 0: + sign = "-" + size = -size + suffixes = ["B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB"] + suffixIndex = 0 + defPrecision = 0 + while size > 1024: + suffixIndex += 1 + size = size / 1024.0 + defPrecision = precision + return "%s%.*f%s" % (sign, defPrecision, size, suffixes[suffixIndex]) From 837c4b609f51216904da7b5874984a4377a15b79 Mon Sep 17 00:00:00 2001 From: Ville Rantanen Date: Thu, 26 Aug 2021 09:44:26 +0300 Subject: [PATCH 2/3] added EXIF tagging --- mirva/mirva.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/mirva/mirva.py b/mirva/mirva.py index 24a85c7..a7d25a1 100755 --- a/mirva/mirva.py +++ b/mirva/mirva.py @@ -341,10 +341,9 @@ function create_button(direction, to) {{ exif_format = ''' ''' From d9f4846aa524efe631e516317b450a4d58ae1f79 Mon Sep 17 00:00:00 2001 From: Ville Rantanen Date: Tue, 31 Aug 2021 15:54:48 +0300 Subject: [PATCH 3/3] video support --- README.md | 1 + mirva/__init__.py | 2 +- mirva/mirva.py | 24 ++++++++++++++++++++++-- mirva/resources/style.css | 2 ++ 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 91157a1..752f093 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Mirva A tool to create a web gallery from a single folder of images. +Also .mp4 files are included in the gallery ## Installation diff --git a/mirva/__init__.py b/mirva/__init__.py index f95b5a7..2c50999 100644 --- a/mirva/__init__.py +++ b/mirva/__init__.py @@ -1,4 +1,4 @@ -__version__ = "20210826.0" +__version__ = "20210831.0" def get_version(): diff --git a/mirva/mirva.py b/mirva/mirva.py index a7d25a1..bd87516 100755 --- a/mirva/mirva.py +++ b/mirva/mirva.py @@ -17,6 +17,8 @@ class Mirva: self.resource_dir = ".mirva" self.config_file = os.path.join(self.resource_dir, "config.cfg") self.config_backup = os.path.join(self.resource_dir, "config.cfg.bkp") + self.image_match = re.compile(".*\.jpg$|.*\.jpeg$|.*\.png$|.*\.gif$|.*\.tif$", re.I) + self.video_match = re.compile(".*\.mp4$", re.I) self.get_options() os.chdir(self.options.folder) self.write_resources() @@ -92,7 +94,7 @@ class Mirva: for f in sorted(os.listdir(".")): if f.startswith("."): continue - if not image_match.match(f): + if not (self.image_match.match(f) or self.video_match.match(f)): continue files.append(f) return files @@ -233,6 +235,22 @@ function create_button(direction, to) {{ def get_post(self, image, title, content): + if self.video_match.match(image): + return """ +
+
 
+
+ +
+
{title}
+
 
+
{content}
+
""".format( + image=image, title=title, content=content + ) + return """
 
@@ -302,9 +320,11 @@ function create_button(direction, to) {{ if link: r = 0 + res = "{:d}x{:d}>".format(int(r), int(r)) force = self.options.force for f in self.file_list: - res = "{:d}x{:d}>".format(int(r), int(r)) + if self.video_match.match(f): + continue outfile = os.path.join(".med", "{}.jpg".format(f)) if force: try: diff --git a/mirva/resources/style.css b/mirva/resources/style.css index d710f26..cae95d6 100644 --- a/mirva/resources/style.css +++ b/mirva/resources/style.css @@ -196,11 +196,13 @@ a:hover { .post_image { max-height: calc(100vh - 60px); max-width: calc(100vw - 128px); + display: inline; } @media only screen and (max-width: 800px) { .post_image { max-height: calc(100vh - 2px); max-width: calc(100vw - 2px); + display: inline; } } /* Footer */