Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge pull request #131 from jmathai/increase-coverage #132

Merged
merged 1 commit into from
Sep 14, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
omit =
*/tests/*
*/external/*
*/tools/*
6 changes: 0 additions & 6 deletions docs/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,12 +52,6 @@ elodie.media
.. automodule:: elodie.media.video
:members:

elodie.arguments
----------------

.. automodule:: elodie.arguments
:members:

elodie.constants
----------------

Expand Down
35 changes: 0 additions & 35 deletions elodie/arguments.py

This file was deleted.

16 changes: 0 additions & 16 deletions elodie/media/video.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
from __future__ import division

# load modules
from distutils.spawn import find_executable
from datetime import datetime

import os
Expand Down Expand Up @@ -53,21 +52,6 @@ def __init__(self, source=None):
self.longitude_ref_key = 'EXIF:GPSLongitudeRef'
self.set_gps_ref = False

def get_avmetareadwrite(self):
"""Get path to executable avmetareadwrite binary.

We wrap this since we call it in a few places and we do a fallback.

:returns: None or string
"""
avmetareadwrite = find_executable('avmetareadwrite')
if(avmetareadwrite is None):
avmetareadwrite = '/usr/bin/avmetareadwrite'
if(not os.path.isfile(avmetareadwrite) or not os.access(avmetareadwrite, os.X_OK)): # noqa
return None

return avmetareadwrite

def get_date_taken(self):
"""Get the date which the photo was taken.

Expand Down
72 changes: 67 additions & 5 deletions elodie/tests/media/base_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,14 @@
os.environ['TZ'] = 'GMT'



def test_get_class_by_file_without_extension():
base_file = helper.get_file('withoutextension')

cls = Base.get_class_by_file(base_file, [Audio, Text, Photo, Video])

assert cls is None, cls

def test_set_album_from_folder_invalid_file():
temporary_folder, folder = helper.create_working_folder()

Expand All @@ -38,9 +46,63 @@ def test_set_album_from_folder_invalid_file():

assert status == False, status

def test_get_class_by_file_without_extension():
base_file = helper.get_file('withoutextension')
def test_set_album_from_folder():
temporary_folder, folder = helper.create_working_folder()

cls = Base.get_class_by_file(base_file, [Audio, Text, Photo, Video])

assert cls is None, cls
origin = '%s/photo.jpg' % folder
shutil.copyfile(helper.get_file('plain.jpg'), origin)

photo = Photo(origin)
metadata = photo.get_metadata()

assert metadata['album'] is None, metadata['album']

new_album_name = os.path.split(folder)[1]
status = photo.set_album_from_folder()

assert status == True, status

photo_new = Photo(origin)
metadata_new = photo_new.get_metadata()

shutil.rmtree(folder)

assert metadata_new['album'] == new_album_name, metadata_new['album']

def test_set_metadata():
temporary_folder, folder = helper.create_working_folder()

origin = '%s/photo.jpg' % folder
shutil.copyfile(helper.get_file('plain.jpg'), origin)

photo = Photo(origin)

metadata = photo.get_metadata()

assert metadata['title'] == None, metadata['title']

new_title = 'Some Title'
photo.set_metadata(title = new_title)

new_metadata = photo.get_metadata()

assert new_metadata['title'] == new_title, new_metadata['title']

def test_set_metadata_basename():
temporary_folder, folder = helper.create_working_folder()

origin = '%s/photo.jpg' % folder
shutil.copyfile(helper.get_file('plain.jpg'), origin)

photo = Photo(origin)

metadata = photo.get_metadata()

assert metadata['base_name'] == 'photo', metadata['base_name']

new_basename = 'Some Base Name'
photo.set_metadata_basename(new_basename)

new_metadata = photo.get_metadata()

assert new_metadata['base_name'] == new_basename, new_metadata['base_name']
Empty file removed tools/__init__.py
Empty file.
Empty file removed tools/scripts/__init__.py
Empty file.
32 changes: 0 additions & 32 deletions tools/scripts/datetime.py

This file was deleted.

36 changes: 0 additions & 36 deletions tools/scripts/geolocation.py

This file was deleted.

You are viewing a condensed version of this merge commit. You can view the full changes here.