From edb21d5e316c7c5c2d2dc3978957653eaf584690 Mon Sep 17 00:00:00 2001
From: Jaisen Mathai <jaisen@jmathai.com>
Date: Tue, 6 Oct 2015 23:47:51 -0700
Subject: [PATCH] Subclass Video to parent Media class

---
 elodie/media/media.py | 68 +++++++++++++++++++++++++++++++++++++++++++
 elodie/media/video.py | 63 ++++++---------------------------------
 2 files changed, 77 insertions(+), 54 deletions(-)
 create mode 100644 elodie/media/media.py

diff --git a/elodie/media/media.py b/elodie/media/media.py
new file mode 100644
index 0000000..fad862b
--- /dev/null
+++ b/elodie/media/media.py
@@ -0,0 +1,68 @@
+"""
+Author: Jaisen Mathai <jaisen@jmathai.com>
+Media package that handles all video operations
+"""
+
+# load modules
+from sys import argv
+import mimetypes
+import os
+import re
+import subprocess
+import time
+
+"""
+Media class for general video operations
+"""
+class Media(object):
+    """
+    @param, source, string, The fully qualified path to the video file
+    """
+    def __init__(self, source=None):
+        self.source = source
+
+    """
+    Get the full path to the video.
+
+    @returns string
+    """
+    def get_file_path(self):
+        return self.source
+
+    """
+    Check the file extension against valid file extensions as returned by get_valid_extensions()
+    
+    @returns, boolean
+    """
+    def is_valid(self):
+        source = self.source
+        # we can't use self.__get_extension else we'll endlessly recurse
+        return os.path.splitext(source)[1][1:].lower() in self.get_valid_extensions()
+
+    """
+    Get the file extension as a lowercased string.
+
+    @returns, string or None for a non-video
+    """
+    def get_extension(self):
+        if(not self.is_valid()):
+            return None
+
+        source = self.source
+        return os.path.splitext(source)[1][1:].lower()
+    
+    """
+    Get the mimetype of the file.
+
+    @returns, string or None for a non-video
+    """
+    def get_mimetype(self):
+        if(not self.is_valid()):
+            return None
+
+        source = self.source
+        mimetype = mimetypes.guess_type(source)
+        if(mimetype == None):
+            return None
+
+        return mimetype[0]
diff --git a/elodie/media/video.py b/elodie/media/video.py
index 81b7c0e..add0390 100644
--- a/elodie/media/video.py
+++ b/elodie/media/video.py
@@ -11,11 +11,12 @@ import re
 import subprocess
 import time
 
+from elodie.media.media import Media
 
 """
 Video class for general video operations
 """
-class Video(object):
+class Video(Media):
     # class / static variable accessible through get_valid_extensions()
     __valid_extensions = ('avi','m4v','mov','mp4','3gp')
 
@@ -23,7 +24,7 @@ class Video(object):
     @param, source, string, The fully qualified path to the video file
     """
     def __init__(self, source=None):
-        self.source = source
+        super(Video, self).__init__(source)
 
     """
     Get a dictionary of metadata for a video.
@@ -37,40 +38,22 @@ class Video(object):
 
         source = self.source
         metadata = {
-            "date_taken": self.__get_date_taken(),
-            "length": self.__get_duration(),
-            "mime_type": self.__get_mimetype(),
+            "date_taken": self.get_date_taken(),
+            "length": self.get_duration(),
+            "mime_type": self.get_mimetype(),
             "base_name": os.path.splitext(os.path.basename(source))[0],
-            "extension": self.__get_extension()
+            "extension": self.get_extension()
         }
 
         return metadata
 
-    """
-    Get the full path to the video.
-
-    @returns string
-    """
-    def get_file_path(self):
-        return self.source
-
-    """
-    Check the file extension against valid file extensions as returned by get_valid_extensions()
-    
-    @returns, boolean
-    """
-    def is_valid(self):
-        source = self.source
-        # we can't use self.__get_extension else we'll endlessly recurse
-        return os.path.splitext(source)[1][1:].lower() in self.get_valid_extensions()
-
     """
     Get the date which the video was taken.
     The date value returned is defined by the min() of mtime and ctime.
 
     @returns, time object or None for non-video files or 0 timestamp
     """
-    def __get_date_taken(self):
+    def get_date_taken(self):
         if(not self.is_valid()):
             return None
 
@@ -87,7 +70,7 @@ class Video(object):
 
     @returns, string or None for a non-video file
     """
-    def __get_duration(self):
+    def get_duration(self):
         if(not self.is_valid()):
             return None
 
@@ -99,34 +82,6 @@ class Video(object):
                 return re.search('(\d{2}:\d{2}.\d{2})', key).group(1).replace('.', ':')
         return None
 
-    """
-    Get the file extension as a lowercased string.
-
-    @returns, string or None for a non-video
-    """
-    def __get_extension(self):
-        if(not self.is_valid()):
-            return None
-
-        source = self.source
-        return os.path.splitext(source)[1][1:].lower()
-    
-    """
-    Get the mimetype of the video.
-
-    @returns, string or None for a non-video
-    """
-    def __get_mimetype(self):
-        if(not self.is_valid()):
-            return None
-
-        source = self.source
-        mimetype = mimetypes.guess_type(source)
-        if(mimetype == None):
-            return None
-
-        return mimetype[0]
-
     """
     Static method to access static __valid_extensions variable.