Rotate images using the Python Pillow library.

cgc/cgc.py

@@ -127,7 +127,7 @@ def run_cmd(cmd):
         logging.debug("convert command output: %s", str(cmd_return))
         return cmd_return
 
-    def convert_rotate(self, image_path_src, image_path_dest, degrees="90"):
+    def image_rotate(self, image_path_src, image_path_dest, degrees="90"):
         """Execute the convert command to rotate an image.
 
         Args:
@@ -137,12 +137,21 @@ def convert_rotate(self, image_path_src, image_path_dest, degrees="90"):
         Returns:
             boolean: If the convert command completed successfully.
         """
-        cmd = ["convert", "-rotate", degrees, image_path_src,
-               image_path_dest]
-
-        if self.run_cmd(cmd)["rc"] != 0:
+        image = Image.open(image_path_src)
+        image_rotated = None
+
+        if degrees == "90":
+            image_rotated = image.transpose(Image.ROTATE_90)
+        elif degrees == "180":
+            image_rotated = image.transpose(Image.ROTATE_180)
+        elif degrees == "270":
+            image_rotated = image.transpose(Image.ROTATE_270)
+        else:
+            logging.error("Incorrect degrees specified. Please use " + \
+                          "90, 180, or 270.")
             return False
 
+        image_rotated.save(image_path_dest)
         return True
 
     def convert_rotate_by_dimensions(self, image_path):
@@ -159,7 +168,7 @@ def convert_rotate_by_dimensions(self, image_path):
         if width > height:
             logging.debug("Rotating image: %s", image_path)
 
-            if not self.convert_rotate(image_path, image_path):
+            if not self.image_rotate(image_path, image_path):
                 return False
 
         return True

cgc_tdd.md

@@ -37,7 +37,7 @@ The "Card Games Converter" (CGC) is a utility for converting pictures of cards i
             * rc (int) = Return code.
             * stdout (str bytes) = Standard output.
             * stderr (str bytes) = Standard error.
-* convert_rotate = Rotate an image.
+* image_rotate = Rotate an image.
     * Input
         * image_path (str) = The full image path to use.
     * Ouput

setup.py

@@ -5,7 +5,7 @@
 
 setuptools.setup(
     name="cgc",
-    version="1.3.1",
+    version="1.4.0",
     author="Luke Short",
     author_email="ekultails@gmail.com",
     url="https://github.com/ekultails/card_games_converter",

tests.py

@@ -68,9 +68,9 @@ def test_run_cmd(self):
             and (convert_results["rc"] != 0):
             self.assertTrue(False)
 
-    def test_convert_rotate(self):
+    def test_image_rotate(self):
         image_dimensions_old = self.cgc.image_info(self.last_image_card)
-        return_status = self.cgc.convert_rotate(self.last_image_card,
+        return_status = self.cgc.image_rotate(self.last_image_card,
                                                 self.tmp_card)
         image_dimensions_new = self.cgc.image_info(self.tmp_card)