From 0864f58a12ae0e4f8ee15fd6e6acc8a2a47bc54f Mon Sep 17 00:00:00 2001
From: Jaisen Mathai <jaisen@jmathai.com>
Date: Sun, 22 Jan 2017 00:19:44 -0800
Subject: [PATCH] Add original file name methods to text and media class #186
 (#187)

---
 elodie/compatability.py                   |  16 +++--
 elodie/filesystem.py                      |   4 +-
 elodie/media/base.py                      |  18 ++++-
 elodie/media/media.py                     |  44 +++++++++++-
 elodie/media/text.py                      |  38 ++++++++--
 elodie/tests/files/with-original-name.jpg | Bin 0 -> 18220 bytes
 elodie/tests/files/with-original-name.txt |   3 +
 elodie/tests/helper.py                    |  15 ++--
 elodie/tests/media/base_test.py           |  35 +++++++--
 elodie/tests/media/media_test.py          |  82 ++++++++++++++++++++++
 elodie/tests/media/text_test.py           |  29 ++++++++
 11 files changed, 259 insertions(+), 25 deletions(-)
 create mode 100644 elodie/tests/files/with-original-name.jpg
 create mode 100644 elodie/tests/files/with-original-name.txt

diff --git a/elodie/compatability.py b/elodie/compatability.py
index ac00f17..e11967d 100644
--- a/elodie/compatability.py
+++ b/elodie/compatability.py
@@ -3,6 +3,7 @@ import shutil
 
 from elodie import constants
 
+
 def _decode(string, encoding='utf8'):
     """Return a utf8 encoded unicode string.
 
@@ -22,6 +23,7 @@ def _decode(string, encoding='utf8'):
 
     return string
 
+
 def _copyfile(src, dst):
     # Python 3 hangs using open/write method
     if (constants.python_version == 3):
@@ -37,7 +39,7 @@ def _copyfile(src, dst):
     WRITE_FLAGS = os.O_WRONLY | os.O_CREAT | os.O_TRUNC | O_BINARY
     TEN_MEGABYTES = 10485760
     BUFFER_SIZE = min(TEN_MEGABYTES, os.path.getsize(src))
-        
+
     try:
         fin = os.open(src, READ_FLAGS)
         stat = os.fstat(fin)
@@ -45,7 +47,11 @@ def _copyfile(src, dst):
         for x in iter(lambda: os.read(fin, BUFFER_SIZE), ""):
             os.write(fout, x)
     finally:
-        try: os.close(fin)
-        except: pass
-        try: os.close(fout)
-        except: pass
+        try:
+            os.close(fin)
+        except:
+            pass
+        try:
+            os.close(fout)
+        except:
+            pass
diff --git a/elodie/filesystem.py b/elodie/filesystem.py
index 97d1aa1..9577e38 100644
--- a/elodie/filesystem.py
+++ b/elodie/filesystem.py
@@ -291,6 +291,7 @@ class FileSystem(object):
             print('%s is not a valid media file. Skipping...' % _file)
             return
 
+        media.set_original_name()
         metadata = media.get_metadata()
 
         directory_name = self.get_folder_path(metadata)
@@ -334,9 +335,8 @@ class FileSystem(object):
             # Do not use copy2(), will have an issue when copying to a
             # network/mounted drive using copy and manual
             # set_date_from_filename gets the job done
-            # Do not use copy2(), will have an issue when copying to a network/mounted drive
             # shutil.copy seems slow, changing to streaming according to
-            # http://stackoverflow.com/questions/22078621/python-how-to-copy-files-fast
+            # http://stackoverflow.com/questions/22078621/python-how-to-copy-files-fast  # noqa
             compatability._copyfile(_file, dest_path)
             self.set_utime(media)
 
diff --git a/elodie/media/base.py b/elodie/media/base.py
index d0dee94..da9d466 100644
--- a/elodie/media/base.py
+++ b/elodie/media/base.py
@@ -90,6 +90,7 @@ class Base(object):
             'album': self.get_album(),
             'title': self.get_title(),
             'mime_type': self.get_mimetype(),
+            'original_name': self.get_original_name(),
             'base_name': os.path.splitext(os.path.basename(source))[0],
             'extension': self.get_extension(),
             'directory_path': os.path.dirname(source)
@@ -100,7 +101,7 @@ class Base(object):
     def get_mimetype(self):
         """Get the mimetype of the file.
 
-        :returns: str or None for a non-video
+        :returns: str or None for unsupported files.
         """
         if(not self.is_valid()):
             return None
@@ -112,6 +113,15 @@ class Base(object):
 
         return mimetype[0]
 
+    def get_original_name(self):
+        """Get the original name of the file from before it was imported.
+        Does not include the extension.
+        Overridden by Media class for files with EXIF.
+
+        :returns: str or None for unsupported files.
+        """
+        return None
+
     def get_title(self):
         """Base method for getting the title of a file
 
@@ -185,6 +195,12 @@ class Base(object):
             if(key in metadata):
                 self.metadata[key] = kwargs[key]
 
+    def set_original_name(self):
+        """Stores the original file name into EXIF/metadata.
+        :returns: bool
+        """
+        return False
+
     @classmethod
     def get_class_by_file(cls, _file, classes):
         """Static method to get a media object by file.
diff --git a/elodie/media/media.py b/elodie/media/media.py
index f721193..40c406c 100644
--- a/elodie/media/media.py
+++ b/elodie/media/media.py
@@ -10,6 +10,8 @@ are used to represent the actual files.
 """
 from __future__ import print_function
 
+import os
+
 # load modules
 from elodie import constants
 from elodie.dependencies import get_exiftool
@@ -46,6 +48,7 @@ class Media(Base):
         self.longitude_keys = ['EXIF:GPSLongitude']
         self.latitude_ref_key = 'EXIF:GPSLatitudeRef'
         self.longitude_ref_key = 'EXIF:GPSLongitudeRef'
+        self.original_name_key = 'XMP:OriginalFileName'
         self.set_gps_ref = True
         self.exiftool_addedargs = [
             '-overwrite_original',
@@ -91,10 +94,10 @@ class Media(Base):
             if key not in exif:
                 continue
 
-            # Cast coordinate to a float due to a bug in exiftool's 
+            # Cast coordinate to a float due to a bug in exiftool's
             #   -json output format.
             # https://github.com/jmathai/elodie/issues/171
-            # http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,7952.0.html #noqa
+            # http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,7952.0.html  # noqa
             this_coordinate = float(exif[key])
 
             # TODO: verify that we need to check ref key
@@ -129,6 +132,24 @@ class Media(Base):
 
         return metadata
 
+    def get_original_name(self):
+        """Get the original name stored in EXIF.
+
+        :returns: str
+        """
+        if(not self.is_valid()):
+            return None
+
+        exiftool_attributes = self.get_exiftool_attributes()
+
+        if exiftool_attributes is None:
+            return None
+
+        if(self.original_name_key not in exiftool_attributes):
+            return None
+
+        return exiftool_attributes[self.original_name_key]
+
     def get_title(self):
         """Get the title for a photo of video
 
@@ -213,6 +234,25 @@ class Media(Base):
 
         return status
 
+    def set_original_name(self):
+        """Sets the original name EXIF tag if not already set.
+
+        :returns: True, False, None
+        """
+        if(not self.is_valid()):
+            return None
+
+        # If EXIF original name tag is set then we return.
+        if self.get_original_name() is not None:
+            return None
+
+        source = self.source
+        name = os.path.basename(source)
+        tags = {self.original_name_key: name}
+        status = self.__set_tags(tags)
+        self.reset_cache()
+        return status
+
     def set_title(self, title):
         """Set title for a photo.
 
diff --git a/elodie/media/text.py b/elodie/media/text.py
index c7e54c7..3f4ea5b 100644
--- a/elodie/media/text.py
+++ b/elodie/media/text.py
@@ -72,6 +72,16 @@ class Text(Base):
         self.parse_metadata_line()
         return super(Text, self).get_metadata()
 
+    def get_original_name(self):
+        self.parse_metadata_line()
+
+        # We return the value if found in metadata
+        if(isinstance(self.metadata_line, dict) and
+                'original_name' in self.metadata_line):
+            return self.metadata_line['original_name']
+
+        return super(Text, self).get_original_name()
+
     def get_title(self):
         self.parse_metadata_line()
 
@@ -92,11 +102,6 @@ class Text(Base):
         self.reset_cache()
         return status
 
-    def set_location(self, latitude, longitude):
-        status = self.write_metadata(latitude=latitude, longitude=longitude)
-        self.reset_cache()
-        return status
-
     def set_date_taken(self, passed_in_time):
         if(time is None):
             return False
@@ -106,6 +111,29 @@ class Text(Base):
         self.reset_cache()
         return status
 
+    def set_original_name(self):
+        """Sets the original name if not already set.
+
+        :returns: True, False, None
+        """
+        if(not self.is_valid()):
+            return None
+
+        # If EXIF original name tag is set then we return.
+        if self.get_original_name() is not None:
+            return None
+
+        source = self.source
+        name = os.path.basename(source)
+        status = self.write_metadata(original_name=name)
+        self.reset_cache()
+        return status
+
+    def set_location(self, latitude, longitude):
+        status = self.write_metadata(latitude=latitude, longitude=longitude)
+        self.reset_cache()
+        return status
+
     def parse_metadata_line(self):
         if isinstance(self.metadata_line, dict):
             return self.metadata_line
diff --git a/elodie/tests/files/with-original-name.jpg b/elodie/tests/files/with-original-name.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f6d8064e0b76a18cda1fcedf1fc45e7966f5daed
GIT binary patch
literal 18220
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

literal 0
HcmV?d00001

diff --git a/elodie/tests/files/with-original-name.txt b/elodie/tests/files/with-original-name.txt
new file mode 100644
index 0000000..c35b56a
--- /dev/null
+++ b/elodie/tests/files/with-original-name.txt
@@ -0,0 +1,3 @@
+{"date_taken":1460027726.0,"latitude":"51.521435","longitude":"0.162714","title":"sample title","original_name":"originalname.txt"}
+
+This file has a valid header.
diff --git a/elodie/tests/helper.py b/elodie/tests/helper.py
index a73fd45..07673fb 100644
--- a/elodie/tests/helper.py
+++ b/elodie/tests/helper.py
@@ -36,11 +36,16 @@ def create_working_folder():
 
 def download_file(name, destination):
     try:
-        final_name = '{}/{}{}'.format(destination, random_string(10), os.path.splitext(name)[1])
-        urllib.urlretrieve(
-            'https://s3.amazonaws.com/jmathai/github/elodie/{}'.format(name),
-            final_name
-        )
+        url_to_file = 'https://s3.amazonaws.com/jmathai/github/elodie/{}'.format(name)
+        # urlretrieve works differently for python 2 and 3
+        if constants.python_version < 3:
+            final_name = '{}/{}{}'.format(destination, random_string(10), os.path.splitext(name)[1])
+            urllib.urlretrieve(
+                url_to_file,
+                final_name
+            )
+        else:
+            final_name, headers = urllib.request.urlretrieve(url_to_file)
         return final_name
     except Exception as e:
         return False
diff --git a/elodie/tests/media/base_test.py b/elodie/tests/media/base_test.py
index f9abe98..bc9dfbf 100644
--- a/elodie/tests/media/base_test.py
+++ b/elodie/tests/media/base_test.py
@@ -24,6 +24,10 @@ from elodie.media.video import Video
 os.environ['TZ'] = 'GMT'
 
 
+def test_get_all_subclasses():
+    subclasses = get_all_subclasses(Base)
+    expected = {Media, Base, Text, Photo, Video, Audio}
+    assert subclasses == expected, subclasses
 
 def test_get_class_by_file_without_extension():
     base_file = helper.get_file('withoutextension')
@@ -32,6 +36,32 @@ def test_get_class_by_file_without_extension():
     
     assert cls is None, cls
 
+def test_get_original_name():
+    temporary_folder, folder = helper.create_working_folder()
+
+    origin = '%s/%s' % (folder, 'with-original-name.jpg')
+    file = helper.get_file('with-original-name.jpg')
+    
+    shutil.copyfile(file, origin)
+
+    media = Media.get_class_by_file(origin, [Photo])
+    original_name = media.get_original_name()
+
+    assert original_name == 'originalfilename.jpg', original_name
+
+def test_get_original_name_invalid_file():
+    temporary_folder, folder = helper.create_working_folder()
+
+    origin = '%s/%s' % (folder, 'invalid.jpg')
+    file = helper.get_file('invalid.jpg')
+    
+    shutil.copyfile(file, origin)
+
+    media = Media.get_class_by_file(origin, [Photo])
+    original_name = media.get_original_name()
+
+    assert original_name is None, original_name
+
 def test_set_album_from_folder_invalid_file():
     temporary_folder, folder = helper.create_working_folder()
 
@@ -106,8 +136,3 @@ def test_set_metadata_basename():
     new_metadata = photo.get_metadata()
 
     assert new_metadata['base_name'] == new_basename, new_metadata['base_name']
-
-def test_get_all_subclasses():
-    subclasses = get_all_subclasses(Base)
-    expected = {Media, Base, Text, Photo, Video, Audio}
-    assert subclasses == expected, subclasses
diff --git a/elodie/tests/media/media_test.py b/elodie/tests/media/media_test.py
index ef7abaf..b4d0743 100644
--- a/elodie/tests/media/media_test.py
+++ b/elodie/tests/media/media_test.py
@@ -61,6 +61,88 @@ def test_get_class_by_file_invalid_type():
                                     [Photo, Video, Audio])
     assert media is None
 
+def test_get_original_name():
+    temporary_folder, folder = helper.create_working_folder()
+
+    origin = '%s/%s' % (folder, 'with-original-name.jpg')
+    file = helper.get_file('with-original-name.jpg')
+    
+    shutil.copyfile(file, origin)
+
+    media = Media.get_class_by_file(origin, [Photo])
+    original_name = media.get_original_name()
+
+    assert original_name == 'originalfilename.jpg', original_name
+
+def test_get_original_name_invalid_file():
+    temporary_folder, folder = helper.create_working_folder()
+
+    origin = '%s/%s' % (folder, 'invalid.jpg')
+    file = helper.get_file('invalid.jpg')
+    
+    shutil.copyfile(file, origin)
+
+    media = Media.get_class_by_file(origin, [Photo])
+    original_name = media.get_original_name()
+
+    assert original_name is None, original_name
+    
+def test_set_original_name_when_exists():
+    temporary_folder, folder = helper.create_working_folder()
+
+    origin = '%s/%s' % (folder, 'with-original-name.jpg')
+    file = helper.get_file('with-original-name.jpg')
+    
+    shutil.copyfile(file, origin)
+
+    media = Media.get_class_by_file(origin, [Photo])
+    result = media.set_original_name()
+
+    assert result is None, result
+
+def test_set_original_name_when_does_not_exist():
+    temporary_folder, folder = helper.create_working_folder()
+
+    origin = '%s/%s' % (folder, 'plain.jpg')
+    file = helper.get_file('plain.jpg')
+    
+    shutil.copyfile(file, origin)
+
+    media = Media.get_class_by_file(origin, [Photo])
+    metadata_before = media.get_metadata()
+    result = media.set_original_name()
+    metadata_after = media.get_metadata()
+
+    assert metadata_before['original_name'] is None, metadata_before
+    assert metadata_after['original_name'] == 'plain.jpg', metadata_after
+    assert result is True, result
+
+def test_set_original_name():
+    files = ['plain.jpg', 'audio.m4a', 'photo.nef', 'video.mov']
+
+    for file in files:
+        ext = os.path.splitext(file)[1]
+
+        temporary_folder, folder = helper.create_working_folder()
+
+        random_file_name = '%s%s' % (helper.random_string(10), ext)
+        origin = '%s/%s' % (folder, random_file_name)
+        file_path = helper.get_file(file)
+        if file_path is False:
+            file_path = helper.download_file(file, folder)
+
+        shutil.copyfile(file_path, origin)
+
+        media = Media.get_class_by_file(origin, [Audio, Media, Photo, Video])
+        metadata = media.get_metadata()
+        media.set_original_name()
+        metadata_updated = media.get_metadata()
+
+        shutil.rmtree(folder)
+
+        assert metadata['original_name'] is None, metadata['original_name']
+        assert metadata_updated['original_name'] == random_file_name, metadata_updated['original_name']
+
 def is_valid():
     media = Media()
 
diff --git a/elodie/tests/media/text_test.py b/elodie/tests/media/text_test.py
index 1e586b6..1721e44 100644
--- a/elodie/tests/media/text_test.py
+++ b/elodie/tests/media/text_test.py
@@ -29,6 +29,18 @@ def test_text_extensions():
 
     assert extensions == valid_extensions, valid_extensions
 
+def test_get_original_name():
+    media = Text(helper.get_file('with-original-name.txt'))
+    original_name = media.get_original_name()
+
+    assert original_name == 'originalname.txt', original_name
+
+def test_get_original_name_when_does_not_exist():
+    media = Text(helper.get_file('valid.txt'))
+    original_name = media.get_original_name()
+
+    assert original_name is None, original_name
+
 def test_get_title():
     text = Text(helper.get_file('valid.txt'))
     text.get_metadata()
@@ -268,3 +280,20 @@ def test_set_location_without_header():
     shutil.rmtree(folder)
 
     assert helper.isclose(metadata['latitude'], 11.1111111111), metadata['latitude']
+
+def test_set_original_name():
+    temporary_folder, folder = helper.create_working_folder()
+
+    random_file_name = '%s.txt' % helper.random_string(10)
+    origin = '%s/%s' % (folder, random_file_name)
+    shutil.copyfile(helper.get_file('valid.txt'), origin)
+
+    text = Text(origin)
+    metadata = text.get_metadata()
+    text.set_original_name()
+    metadata_updated = text.get_metadata()
+
+    shutil.rmtree(folder)
+
+    assert metadata['original_name'] is None, metadata['original_name']
+    assert metadata_updated['original_name'] == random_file_name, metadata_updated['original_name']