Rename jpeg extension to jpg

EditionOpenAccess · Sep 25, 2020 · 776194e · 776194e
1 parent 3507108
commit 776194e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/imxml2epub.py b/src/imxml2epub.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8; mode: python -*-
-# Time-stamp: <2020-09-24 16:27:42 (kthoden)>
+# Time-stamp: <2020-09-25 08:08:41 (kthoden)>
 
 """ Convert a customized DocBook XML file into a set of files that
 constitute the contents of an EPUB file.
@@ -776,6 +776,10 @@ def add_css_snippet(css_snippet, css_file):
     strImageFileDir = re.sub("/", "", strImageFileDir)
     strImageFileName = os.path.basename(strImageFileString)
     strImageFileNamewoSuffix, strImageFileName_Suffix = os.path.splitext(strImageFileName)
+
+    if strImageFileName_Suffix == ".jpeg":
+        strImageFileName = strImageFileName.replace(".jpeg", ".jpg")
+
     shutil.copy(
             PUBLICATION_DIR / strImageFileString,
             OUTPUT_DIR / "OEBPS/images" / (strImageFileDir + strImageFileName)
@@ -855,6 +859,10 @@ def add_css_snippet(css_snippet, css_file):
     strImageFileDir = re.sub("/", "", strImageFileDir)
     strImageFileName = os.path.basename(strImageFileString)
     strImageFileNamewoSuffix, strImageFileName_Suffix = os.path.splitext(strImageFileName)
+
+    if strImageFileName_Suffix == ".jpeg":
+        strImageFileName = strImageFileName.replace(".jpeg", ".jpg")
+
     shutil.copy(
             PUBLICATION_DIR / strImageFileString,
             OUTPUT_DIR / "OEBPS/images" / (strImageFileDir + strImageFileName)

diff --git a/src/utils/libeoaconvert.py b/src/utils/libeoaconvert.py
@@ -106,14 +106,12 @@ def sanitizeImage(
     strFileFormat = strFileFormat_bytes.decode("utf-8").strip()
     logging.debug(f"Image has been recognized as having format {strFileFormat} by {GM_PATH}.")
     if strFileFormat == "JPEG":
-        pass
-        # print("looking at jpeg file")
-        # strNewImagepath = os.path.splitext(strImagepath)[0]
+        strNewImagepath = os.path.splitext(strImagepath)[0]
         # strCommand = GM_PATH + " convert " + strImagepath + " " + strNewImagepath + ".jpg"
         # listArguments = shlex.split(strCommand)
         # subprocess.call(listArguments)
         # os.remove(strImagepath)
-        # strImagepath = strNewImagepath + ".jpg"
+        strImagepath = strNewImagepath + ".jpg"
     elif strFileFormat == "PNG":
         pass
         # print("looking at png file")