Merge lp:~schwann/gallery-app/gallery-photo-dependency-reduce into lp:gallery-app

[Günter Schwann]

Remove many dependencies on photo

Remove many dependencies on photo.
When others depend on the base class MediaSource instead of Photo directly, it's easier to add the Video class.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:690
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/205/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1924

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/205/rebuild

review: Approve (continuous-integration)

[lp:~schwann/gallery-app/gallery-photo-dependency-reduce]

691. By Günter Schwann on 2013-06-06

Trunk merged

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:691
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/206/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1927

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/206/rebuild

review: Approve (continuous-integration)

[lp:~schwann/gallery-app/gallery-photo-dependency-reduce]

692. By Günter Schwann on 2013-06-06

Trunk merged

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:692
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/210/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1937

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/210/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:692
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/210/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/20
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/20
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/20/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/20
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1937

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/210/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:692
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/212/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/22
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/22/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/22
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1943/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/212/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:692
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/213/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/23
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1945

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/213/rebuild

review: Approve (continuous-integration)

[lp:~schwann/gallery-app/gallery-photo-dependency-reduce]

693. By Günter Schwann on 2013-06-07

trunk merged

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:693
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/214/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/24
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/24/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/24
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1948

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/214/rebuild

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

QStringList filenames = mediaDir.entryList(); should be const
Maybe while you are at touching the code, changing NULL to 0 would good

review: Approve

[lp:~schwann/gallery-app/gallery-photo-dependency-reduce]

694. By Günter Schwann on 2013-06-07

Minor improvements of old (now moved) code

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:694
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/217/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1953

Click here to trigger a rebuild:
http://s-jenkins:8080/job/gallery-app-ci/217/rebuild

review: Approve (continuous-integration)

=== modified file 'src/album/CMakeLists.txt'
--- src/album/CMakeLists.txt	2013-06-06 15:33:12 +0000
+++ src/album/CMakeLists.txt	2013-06-07 11:10:22 +0000
@@ -9,7 +9,6 @@
     # FIXME resolve the circulate dependencies
     ${gallery_src_SOURCE_DIR}/database
     ${gallery_src_SOURCE_DIR}/media
-    ${gallery_src_SOURCE_DIR}/photo
     ${gallery_src_SOURCE_DIR}/qml
     ${gallery_util_src_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
@@ -44,7 +43,6 @@
     gallery-core
     gallery-database
     gallery-media
-    gallery-photo
     gallery-qml
     gallery-util
     ${GSTLIB_LDFLAGS}
 
=== modified file 'src/core/data-collection.h'
--- src/core/data-collection.h	2013-06-06 16:02:25 +0000
+++ src/core/data-collection.h	2013-06-07 11:10:22 +0000
@@ -67,7 +67,7 @@
     int Count() const;
 
     void Add(DataObject* object);
-    void AddMany(const QSet<DataObject*>& objects);
+    virtual void AddMany(const QSet<DataObject*>& objects);
 
     void Remove(DataObject* object);
     void RemoveAt(int index);
 
=== modified file 'src/database/media-table.h'
--- src/database/media-table.h	2013-06-06 16:02:25 +0000
+++ src/database/media-table.h	2013-06-07 11:10:22 +0000
@@ -20,7 +20,8 @@
 #ifndef MEDIATABLE_H
 #define MEDIATABLE_H
 
-#include "photo-metadata.h"
+// util
+#include "orientation.h"
 
 #include <QObject>
 
 
=== modified file 'src/event/CMakeLists.txt'
--- src/event/CMakeLists.txt	2013-06-06 15:33:12 +0000
+++ src/event/CMakeLists.txt	2013-06-07 11:10:22 +0000
@@ -8,7 +8,6 @@
     # because of circulate dependencies the sub project can't be used directly
     # FIXME resolve the circulate dependencies
     ${gallery_src_SOURCE_DIR}/media
-    ${gallery_src_SOURCE_DIR}/photo
     ${gallery_util_src_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
     ${GSTLIB_INCLUDE_DIRS}
@@ -33,7 +32,6 @@
 target_link_libraries( ${GALLERY_EVENT_LIB}
     gallery-core
     gallery-media
-    gallery-photo
     gallery-util
     ${GSTLIB_LDFLAGS}
     )
 
=== modified file 'src/gallery-application.cpp'
--- src/gallery-application.cpp	2013-06-06 16:02:25 +0000
+++ src/gallery-application.cpp	2013-06-07 11:10:22 +0000
@@ -223,8 +223,8 @@
  */
 void GalleryApplication::on_media_item_added(QFileInfo item_info)
 {
-    Photo* new_photo = Photo::Fetch(item_info);
+    MediaSource* newMedia = Photo::Fetch(item_info);
 
-    if (new_photo)
-        GalleryManager::instance()->media_collection()->Add(new_photo);
+    if (newMedia)
+        GalleryManager::instance()->media_collection()->Add(newMedia);
 }
 
=== modified file 'src/gallery-manager.cpp'
--- src/gallery-manager.cpp	2013-06-06 16:02:25 +0000
+++ src/gallery-manager.cpp	2013-06-07 11:10:22 +0000
@@ -33,6 +33,7 @@
 
 // media
 #include "media-collection.h"
+#include "photo.h"
 #include "preview-manager.h"
 
 // qml
@@ -42,6 +43,8 @@
 // util
 #include "resource.h"
 
+#include <exiv2/exiv2.hpp>
+
 GalleryManager* GalleryManager::gallery_mgr_ = NULL;
 
 /*!
@@ -94,8 +97,8 @@
                                  resource_->get_rc_url("sql").path());
         database_->get_media_table()->verify_files();
         default_template_ = new AlbumDefaultTemplate();
-        QDir mediaDir(resource_->picturesDirectory());
-        media_collection_ = new MediaCollection(mediaDir);
+        media_collection_ = new MediaCollection();
+        fillMediaCollection();
         album_collection_ = new AlbumCollection();
         event_collection_ = new EventCollection();
 
@@ -171,3 +174,29 @@
     // Verify previews for all existing added MediaSources
     preview_manager_->onMediaAddedRemoved(&media_collection_->GetAsSet(), NULL);
 }
+
+/*!
+ * \brief GalleryManager::fillMediaCollection fills the MediaCollection with
+ * the content of the picture directory
+ */
+void GalleryManager::fillMediaCollection()
+{
+    Q_ASSERT(media_collection_);
+
+    QDir mediaDir(resource_->picturesDirectory());
+    mediaDir.setFilter(QDir::Files);
+    mediaDir.setSorting(QDir::Name);
+
+    QSet<DataObject*> photos;
+    const QStringList filenames = mediaDir.entryList();
+    foreach (const QString& filename, filenames) {
+        QFileInfo file(mediaDir, filename);
+        Photo *p = Photo::Load(file);
+        if (!p)
+            continue;
+
+        photos.insert(p);
+    }
+
+    media_collection_->AddMany(photos);
+}
 
=== modified file 'src/gallery-manager.h'
--- src/gallery-manager.h	2013-06-06 16:02:25 +0000
+++ src/gallery-manager.h	2013-06-07 11:10:22 +0000
@@ -71,6 +71,7 @@
     void operator=(const GalleryManager&);
 
     void initPreviewManager();
+    void fillMediaCollection();
 
     static GalleryManager* gallery_mgr_;
 
 
=== modified file 'src/media/CMakeLists.txt'
--- src/media/CMakeLists.txt	2013-06-07 11:10:22 +0000
+++ src/media/CMakeLists.txt	2013-06-07 11:10:22 +0000
@@ -10,7 +10,6 @@
     ${gallery_src_SOURCE_DIR}/database
     ${gallery_src_SOURCE_DIR}/event
     ${gallery_src_SOURCE_DIR}/medialoader
-    ${gallery_src_SOURCE_DIR}/photo
     ${gallery_util_src_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
     ${GSTLIB_INCLUDE_DIRS}
@@ -39,7 +38,6 @@
     gallery-database
     gallery-event
     gallery-medialoader
-    gallery-photo
     gallery-util
     ${GSTLIB_LDFLAGS}
     )
 
=== modified file 'src/media/media-collection.cpp'
--- src/media/media-collection.cpp	2013-06-06 16:02:25 +0000
+++ src/media/media-collection.cpp	2013-06-07 11:10:22 +0000
@@ -18,14 +18,12 @@
  */
 
 #include "media-collection.h"
+#include "media-source.h"
 
 // database
 #include "database.h"
 #include "media-table.h"
 
-// photo
-#include "photo.h"
-
 // src
 #include "gallery-manager.h"
 
@@ -37,39 +35,11 @@
  * \brief MediaCollection::MediaCollection
  * \param directory
  */
-MediaCollection::MediaCollection(const QDir& directory)
-    : SourceCollection("MediaCollection"), directory_(directory)
+MediaCollection::MediaCollection()
+    : SourceCollection("MediaCollection")
 {
-    directory_.setFilter(QDir::Files);
-    directory_.setSorting(QDir::Name);
-
     // By default, sort all media by its exposure date time, descending
     SetComparator(ExposureDateTimeDescendingComparator);
-
-    QSet<DataObject*> photos;
-    QStringList filenames = directory_.entryList();
-    QString filename;
-    foreach (filename, filenames) {
-        QFileInfo file(directory_, filename);
-
-        Photo *p = Photo::Load(file);
-        if (!p)
-            continue;
-
-        photos.insert(p);
-        id_map_.insert(p->get_id(), p);
-    }
-
-    AddMany(photos);
-}
-
-/*!
- * \brief MediaCollection::directory
- * \return
- */
-const QDir& MediaCollection::directory() const
-{
-    return directory_;
 }
 
 /*!
@@ -132,9 +102,9 @@
             DataObject* o = i.next();
             id_map_.insert(qobject_cast<MediaSource*>(o)->get_id(), o);
 
-            Photo* p = qobject_cast<Photo*>(o);
-            if (p != NULL) {
-                file_photo_map_.insert(p->file().absoluteFilePath(), p);
+            MediaSource* media = qobject_cast<MediaSource*>(o);
+            if (media != 0) {
+                m_filePhotoMap.insert(media->file().absoluteFilePath(), media);
             }
         }
     }
@@ -145,9 +115,8 @@
             DataObject* o = i.next();
             MediaSource* media = qobject_cast<MediaSource*>(o);
 
-            Photo* p = qobject_cast<Photo*>(o);
-            if (p != NULL) {
-                file_photo_map_.remove(p->file().absoluteFilePath());
+            if (media != 0) {
+                m_filePhotoMap.remove(media->file().absoluteFilePath());
             }
 
             id_map_.remove(media->get_id());
@@ -168,7 +137,20 @@
  * \param file_to_load
  * \return
  */
-Photo* MediaCollection::photoFromFileinfo(QFileInfo file_to_load)
-{
-    return file_photo_map_.value(file_to_load.absoluteFilePath(), NULL);
+MediaSource *MediaCollection::photoFromFileinfo(const QFileInfo& file_to_load)
+{
+    return m_filePhotoMap.value(file_to_load.absoluteFilePath(), 0);
+}
+
+/*!
+ * \reimp
+ */
+void MediaCollection::AddMany(const QSet<DataObject *> &objects)
+{
+    foreach (DataObject* data, objects) {
+        MediaSource* media = qobject_cast<MediaSource*>(data);
+        id_map_.insert(media->get_id(), media);
+    }
+
+    DataCollection::AddMany(objects);
 }
 
=== modified file 'src/media/media-collection.h'
--- src/media/media-collection.h	2013-06-06 16:02:25 +0000
+++ src/media/media-collection.h	2013-06-07 11:10:22 +0000
@@ -20,7 +20,7 @@
 #ifndef GALLERY_MEDIA_COLLECTION_H_
 #define GALLERY_MEDIA_COLLECTION_H_
 
-#include <QDir>
+#include <QFileInfo>
 #include <QHash>
 #include <QSet>
 
@@ -29,7 +29,6 @@
 
 class DataObject;
 class MediaSource;
-class Photo;
 
 /*!
  * \brief The MediaCollection class
@@ -39,16 +38,15 @@
     Q_OBJECT
 
 public:
-    MediaCollection(const QDir& directory);
+    MediaCollection();
 
     static bool ExposureDateTimeAscendingComparator(DataObject* a, DataObject* b);
     static bool ExposureDateTimeDescendingComparator(DataObject* a, DataObject* b);
 
-    const QDir& directory() const;
-
     MediaSource* mediaForId(qint64 id);
+    MediaSource* photoFromFileinfo(const QFileInfo &file_to_load);
 
-    Photo* photoFromFileinfo(QFileInfo file_to_load);
+    virtual void AddMany(const QSet<DataObject*>& objects);
 
 protected slots:
     virtual void notify_contents_altered(const QSet<DataObject*>* added,
@@ -57,9 +55,8 @@
 private:
     // Used by photoFromFileinfo() to prevent ourselves from accidentally
     // seeing a duplicate photo after an edit.
-    QHash<QString, Photo*> file_photo_map_;
+    QHash<QString, MediaSource*> m_filePhotoMap;
 
-    QDir directory_;
     QHash<qint64, DataObject*> id_map_;
 };
 
 
=== modified file 'src/media/media-source.cpp'
--- src/media/media-source.cpp	2013-06-06 16:02:25 +0000
+++ src/media/media-source.cpp	2013-06-07 11:10:22 +0000
@@ -150,8 +150,10 @@
  * \param respect_orientation
  * \return
  */
-QImage MediaSource::Image(bool respect_orientation)
+QImage MediaSource::Image(bool respect_orientation, const QSize &scaleSize)
 {
+    Q_UNUSED(respect_orientation);
+    Q_UNUSED(scaleSize);
     // QML data types cannot be abstract, so return a null image
     return QImage();
 }
 
=== modified file 'src/media/media-source.h'
--- src/media/media-source.h	2013-06-06 16:02:25 +0000
+++ src/media/media-source.h	2013-06-07 11:10:22 +0000
@@ -23,8 +23,8 @@
 // core
 #include "data-source.h"
 
-// photo
-#include "photo-metadata.h"
+// util
+#include "orientation.h"
 
 #include <QDate>
 #include <QDateTime>
@@ -93,7 +93,7 @@
     QUrl thumbnail_path() const;
     virtual QUrl gallery_thumbnail_path() const;
 
-    virtual QImage Image(bool respect_orientation = true);
+    virtual QImage Image(bool respect_orientation = true, const QSize &scaleSize=QSize());
     virtual Orientation orientation() const;
     virtual QDateTime exposure_date_time() const;
 
 
=== modified file 'src/medialoader/CMakeLists.txt'
--- src/medialoader/CMakeLists.txt	2013-06-07 11:10:22 +0000
+++ src/medialoader/CMakeLists.txt	2013-06-07 11:10:22 +0000
@@ -7,9 +7,6 @@
     ${gallery_core_src_SOURCE_DIR}
     # because of circulate dependencies the sub project can't be used directly
     # FIXME resolve the circulate dependencies
-    ${gallery_src_SOURCE_DIR}/database
-    ${gallery_src_SOURCE_DIR}/event
-    ${gallery_src_SOURCE_DIR}/photo
     ${gallery_src_SOURCE_DIR}/media
     ${gallery_util_src_SOURCE_DIR}
     ${CMAKE_BINARY_DIR}
@@ -19,12 +16,14 @@
 set(gallery_medialoader_HDRS
     gallery-standard-image-provider.h
     gallery-thumbnail-image-provider.h
+    photo-metadata.h
     preview-manager.h
     )
 
 set(gallery_medialoader_SRCS
     gallery-standard-image-provider.cpp
     gallery-thumbnail-image-provider.cpp
+    photo-metadata.cpp
     preview-manager.cpp
     )
 
@@ -36,9 +35,6 @@
 
 target_link_libraries( ${GALLERY_MEDIALOADER_LIB}
     gallery-core
-    gallery-database
-    gallery-event
-    gallery-photo
     gallery-media
     gallery-util
     ${GSTLIB_LDFLAGS}
 
=== modified file 'src/medialoader/gallery-standard-image-provider.cpp'
--- src/medialoader/gallery-standard-image-provider.cpp	2013-06-06 16:02:25 +0000
+++ src/medialoader/gallery-standard-image-provider.cpp	2013-06-07 11:10:22 +0000
@@ -19,8 +19,7 @@
  */
 
 #include "gallery-standard-image-provider.h"
-
-// media
+#include "photo-metadata.h"
 #include "preview-manager.h"
 
 #include <QDebug>
 
=== modified file 'src/medialoader/gallery-standard-image-provider.h'
--- src/medialoader/gallery-standard-image-provider.h	2013-06-06 16:02:25 +0000
+++ src/medialoader/gallery-standard-image-provider.h	2013-06-07 11:10:22 +0000
@@ -21,7 +21,8 @@
 #ifndef GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_
 #define GALLERY_GALLERY_STANDARD_IMAGE_PROVIDER_H_
 
-#include "photo-metadata.h"
+// util
+#include "orientation.h"
 
 #include <QFileInfo>
 #include <QImage>
 
=== renamed file 'src/photo/photo-metadata.cpp' => 'src/medialoader/photo-metadata.cpp'
--- src/photo/photo-metadata.cpp	2013-06-06 16:02:25 +0000
+++ src/medialoader/photo-metadata.cpp	2013-06-07 11:10:22 +0000
@@ -149,31 +149,6 @@
 }
 
 /*!
- * \brief PhotoMetadata::rotate_orientation
- * \param orientation
- * \param left
- * \return
- */
-Orientation PhotoMetadata::rotate_orientation(Orientation orientation, bool left)
-{
-    QVector<Orientation> sequence_a;
-    QVector<Orientation> sequence_b;
-    sequence_a <<
-                  TOP_LEFT_ORIGIN << LEFT_BOTTOM_ORIGIN << BOTTOM_RIGHT_ORIGIN << RIGHT_TOP_ORIGIN;
-    sequence_b <<
-                  TOP_RIGHT_ORIGIN << RIGHT_BOTTOM_ORIGIN << BOTTOM_LEFT_ORIGIN << LEFT_TOP_ORIGIN;
-
-    const QVector<Orientation>& sequence = (
-                sequence_a.contains(orientation) ? sequence_a : sequence_b);
-
-    int current = sequence.indexOf(orientation);
-    int jump = (left ? 1 : sequence.count() - 1);
-    int next = (current + jump) % sequence.count();
-
-    return sequence[next];
-}
-
-/*!
  * \brief PhotoMetadata::orientation
  * \return
  */
@@ -260,108 +235,3 @@
         return false;
     }
 }
-
-/*!
- * \brief OrientationCorrection::FromOrientation
- * \param o
- * \return
- */
-OrientationCorrection OrientationCorrection::FromOrientation(Orientation o)
-{
-    double rotation_angle = 0.0;
-    double horizontal_scale_factor = 1.0;
-
-    switch (o) {
-    case TOP_RIGHT_ORIGIN:
-        horizontal_scale_factor = -1.0;
-        break;
-
-    case BOTTOM_RIGHT_ORIGIN:
-        rotation_angle = 180.0;
-        break;
-
-    case BOTTOM_LEFT_ORIGIN:
-        horizontal_scale_factor = -1.0;
-        rotation_angle = 180.0;
-        break;
-
-    case LEFT_TOP_ORIGIN:
-        horizontal_scale_factor = -1.0;
-        rotation_angle = -90.0;
-        break;
-
-    case RIGHT_TOP_ORIGIN:
-        rotation_angle = 90.0;
-        break;
-
-    case RIGHT_BOTTOM_ORIGIN:
-        horizontal_scale_factor = -1.0;
-        rotation_angle = 90.0;
-        break;
-
-    case LEFT_BOTTOM_ORIGIN:
-        rotation_angle = -90.0;
-        break;
-
-    default:
-        ; // do nothing
-        break;
-    }
-
-    return OrientationCorrection(rotation_angle, horizontal_scale_factor);
-}
-
-/*!
- * \brief OrientationCorrection::Identity
- * \return
- */
-OrientationCorrection OrientationCorrection::Identity()
-{
-    return OrientationCorrection(0.0, 1.0);
-}
-
-/*!
- * \brief OrientationCorrection::to_transform
- * Returns the correction as a QTransform.
- * \return Returns the correction as a QTransform.
- */
-QTransform OrientationCorrection::to_transform() const
-{
-    QTransform result;
-    result.scale(horizontal_scale_factor_, 1.0);
-    result.rotate(rotation_angle_);
-
-    return result;
-}
-
-/*!
- * \brief OrientationCorrection::is_flipped_from
- * Returns whether the two orientations are flipped relative to each other.
- * Ignores rotation_angle; only checks horizontal_scale_factor_.
- * \param other
- * \return
- */
-bool OrientationCorrection::is_flipped_from(
-        const OrientationCorrection& other) const
-{
-    return (horizontal_scale_factor_ != other.horizontal_scale_factor_);
-}
-
-/*!
- * \brief OrientationCorrection::get_normalized_rotation_difference
- * Returns the rotation difference in degrees (this - other), normalized to
- * 0, 90, 180, or 270.  Ignores the horizontal_scale_factor_.
- * \param other
- * \return
- */
-int OrientationCorrection::get_normalized_rotation_difference(
-        const OrientationCorrection& other) const
-{
-    int degrees_rotation = (int)rotation_angle_ - (int)other.rotation_angle_;
-    if (degrees_rotation < 0)
-        degrees_rotation += 360;
-
-    Q_ASSERT(degrees_rotation == 0 || degrees_rotation == 90 ||
-             degrees_rotation == 180 || degrees_rotation == 270);
-    return degrees_rotation;
-}
 
=== renamed file 'src/photo/photo-metadata.h' => 'src/medialoader/photo-metadata.h'
--- src/photo/photo-metadata.h	2013-06-06 16:02:25 +0000
+++ src/medialoader/photo-metadata.h	2013-06-07 11:10:22 +0000
@@ -20,6 +20,9 @@
 #ifndef GALLERY_PHOTO_METADATA_H_
 #define GALLERY_PHOTO_METADATA_H_
 
+// util
+#include <orientation.h>
+
 #include <QDateTime>
 #include <QFileInfo>
 #include <QObject>
@@ -29,42 +32,6 @@
 
 #include <exiv2/exiv2.hpp>
 
-enum Orientation {
-    MIN_ORIENTATION = 1,
-    TOP_LEFT_ORIGIN = 1,
-    TOP_RIGHT_ORIGIN = 2,
-    BOTTOM_RIGHT_ORIGIN = 3,
-    BOTTOM_LEFT_ORIGIN = 4,
-    LEFT_TOP_ORIGIN = 5,
-    RIGHT_TOP_ORIGIN = 6,
-    RIGHT_BOTTOM_ORIGIN = 7,
-    LEFT_BOTTOM_ORIGIN = 8,
-    MAX_ORIENTATION = 8
-};
-
-/*!
- * \brief The OrientationCorrection struct
- */
-class OrientationCorrection
-{
-public:
-    static OrientationCorrection FromOrientation(Orientation o);
-    static OrientationCorrection Identity();
-
-    const double rotation_angle_;
-    const double horizontal_scale_factor_;
-
-    QTransform to_transform() const;
-
-    bool is_flipped_from(const OrientationCorrection& other) const;
-    int get_normalized_rotation_difference(const OrientationCorrection& other) const;
-
-private:
-    OrientationCorrection(double rotation_angle, double horizontal_scale_factor)
-        : rotation_angle_(rotation_angle),
-          horizontal_scale_factor_(horizontal_scale_factor) { }
-};
-
 /*!
  * \brief The PhotoMetadata class
  */
@@ -76,8 +43,6 @@
     static PhotoMetadata* FromFile(const char* filepath);
     static PhotoMetadata* FromFile(const QFileInfo& file);
 
-    static Orientation rotate_orientation(Orientation orientation, bool left);
-    
     QDateTime exposure_time() const;
     Orientation orientation() const;
     QTransform orientation_transform() const;
 
=== modified file 'src/medialoader/preview-manager.cpp'
--- src/medialoader/preview-manager.cpp	2013-06-06 16:02:25 +0000
+++ src/medialoader/preview-manager.cpp	2013-06-07 11:10:22 +0000
@@ -21,9 +21,7 @@
 
 // media
 #include "media-collection.h"
-
-// photo
-#include "photo.h"
+#include "media-source.h"
 
 #include <QCryptographicHash>
 #include <QDir>
@@ -148,7 +146,7 @@
 
     QImage thumbMaster;
     if (updateNeeded(file, QFileInfo(preview)) || regen) {
-        Photo* photo = m_mediaCollection->photoFromFileinfo(file);
+        MediaSource* photo = m_mediaCollection->photoFromFileinfo(file);
         QSize previewSize(PREVIEW_SIZE, PREVIEW_SIZE);
         QImage fullsized(photo->Image(true, previewSize));
         if (fullsized.isNull()) {
 
=== modified file 'src/photo/CMakeLists.txt'
--- src/photo/CMakeLists.txt	2013-06-07 11:10:22 +0000
+++ src/photo/CMakeLists.txt	2013-06-07 11:10:22 +0000
@@ -20,14 +20,12 @@
     photo.h
     photo-caches.h
     photo-edit-state.h
-    photo-metadata.h
     )
 
 set(gallery_photo_SRCS
     photo.cpp
     photo-caches.cpp
     photo-edit-state.cpp
-    photo-metadata.cpp
     )
 
 add_library(${GALLERY_PHOTO_LIB}
 
=== modified file 'src/photo/photo-edit-state.h'
--- src/photo/photo-edit-state.h	2013-06-06 16:02:25 +0000
+++ src/photo/photo-edit-state.h	2013-06-07 11:10:22 +0000
@@ -20,7 +20,8 @@
 #ifndef GALLERY_PHOTO_EDIT_STATE_H_
 #define GALLERY_PHOTO_EDIT_STATE_H_
 
-#include "photo-metadata.h"
+// util
+#include "orientation.h"
 
 #include <QRect>
 #include <QVector4D>
 
=== modified file 'src/photo/photo.cpp'
--- src/photo/photo.cpp	2013-06-06 16:02:25 +0000
+++ src/photo/photo.cpp	2013-06-07 11:10:22 +0000
@@ -31,9 +31,10 @@
 // media
 #include "media-collection.h"
 
-// qml
+// medialoader
 #include "gallery-standard-image-provider.h"
 #include "gallery-thumbnail-image-provider.h"
+#include "photo-metadata.h"
 
 // util
 #include "imaging.h"
@@ -267,9 +268,12 @@
 {
     GalleryManager* gallery_mgr = GalleryManager::instance();
 
-    Photo* p = gallery_mgr->media_collection()->photoFromFileinfo(file);
-    if (p == NULL) {
+    Photo* p = 0;
+    MediaSource* media = gallery_mgr->media_collection()->photoFromFileinfo(file);
+    if (media == 0) {
         p = Load(file);
+    } else {
+        p = qobject_cast<Photo*>(media);
     }
 
     return p;
@@ -480,7 +484,7 @@
 void Photo::rotateRight()
 {
     Orientation new_orientation =
-            PhotoMetadata::rotate_orientation(orientation(), false);
+            OrientationCorrection::rotate_orientation(orientation(), false);
 
     QSize size = get_original_size(orientation());
 
 
=== modified file 'src/photo/photo.h'
--- src/photo/photo.h	2013-06-06 16:02:25 +0000
+++ src/photo/photo.h	2013-06-07 11:10:22 +0000
@@ -24,11 +24,13 @@
 
 #include "photo-caches.h"
 #include "photo-edit-state.h"
-#include "photo-metadata.h"
 
 // media
 #include "media-source.h"
 
+// util
+#include "orientation.h"
+
 #include <QDateTime>
 #include <QStack>
 
 
=== modified file 'src/util/CMakeLists.txt'
--- src/util/CMakeLists.txt	2013-06-06 08:27:23 +0000
+++ src/util/CMakeLists.txt	2013-06-07 11:10:22 +0000
@@ -13,6 +13,7 @@
     collections.h
     command-line-parser.h
     imaging.h
+    orientation.h
     resource.h
     sharefile.h
     variants.h
@@ -21,6 +22,7 @@
 set(gallery_util_SRCS
     command-line-parser.cpp
     imaging.cpp
+    orientation.cpp
     resource.cpp
     sharefile.cpp
     )
 
=== added file 'src/util/orientation.cpp'
--- src/util/orientation.cpp	1970-01-01 00:00:00 +0000
+++ src/util/orientation.cpp	2013-06-07 11:10:22 +0000
@@ -0,0 +1,152 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Lucas Beeler <[e-mail]>
+ */
+
+#include <cstdio>
+
+#include "orientation.h"
+
+/*!
+ * \brief OrientationCorrection::FromOrientation
+ * \param o
+ * \return
+ */
+OrientationCorrection OrientationCorrection::FromOrientation(Orientation o)
+{
+    double rotation_angle = 0.0;
+    double horizontal_scale_factor = 1.0;
+
+    switch (o) {
+    case TOP_RIGHT_ORIGIN:
+        horizontal_scale_factor = -1.0;
+        break;
+
+    case BOTTOM_RIGHT_ORIGIN:
+        rotation_angle = 180.0;
+        break;
+
+    case BOTTOM_LEFT_ORIGIN:
+        horizontal_scale_factor = -1.0;
+        rotation_angle = 180.0;
+        break;
+
+    case LEFT_TOP_ORIGIN:
+        horizontal_scale_factor = -1.0;
+        rotation_angle = -90.0;
+        break;
+
+    case RIGHT_TOP_ORIGIN:
+        rotation_angle = 90.0;
+        break;
+
+    case RIGHT_BOTTOM_ORIGIN:
+        horizontal_scale_factor = -1.0;
+        rotation_angle = 90.0;
+        break;
+
+    case LEFT_BOTTOM_ORIGIN:
+        rotation_angle = -90.0;
+        break;
+
+    default:
+        ; // do nothing
+        break;
+    }
+
+    return OrientationCorrection(rotation_angle, horizontal_scale_factor);
+}
+
+/*!
+ * \brief OrientationCorrection::Identity
+ * \return
+ */
+OrientationCorrection OrientationCorrection::Identity()
+{
+    return OrientationCorrection(0.0, 1.0);
+}
+
+/*!
+ * \brief OrientationCorrection::rotate_orientation
+ * \param orientation
+ * \param left
+ * \return
+ */
+Orientation OrientationCorrection::rotate_orientation(Orientation orientation, bool left)
+{
+    QVector<Orientation> sequence_a;
+    QVector<Orientation> sequence_b;
+    sequence_a <<
+                  TOP_LEFT_ORIGIN << LEFT_BOTTOM_ORIGIN << BOTTOM_RIGHT_ORIGIN << RIGHT_TOP_ORIGIN;
+    sequence_b <<
+                  TOP_RIGHT_ORIGIN << RIGHT_BOTTOM_ORIGIN << BOTTOM_LEFT_ORIGIN << LEFT_TOP_ORIGIN;
+
+    const QVector<Orientation>& sequence = (
+                sequence_a.contains(orientation) ? sequence_a : sequence_b);
+
+    int current = sequence.indexOf(orientation);
+    int jump = (left ? 1 : sequence.count() - 1);
+    int next = (current + jump) % sequence.count();
+
+    return sequence[next];
+}
+
+/*!
+ * \brief OrientationCorrection::to_transform
+ * Returns the correction as a QTransform.
+ * \return Returns the correction as a QTransform.
+ */
+QTransform OrientationCorrection::to_transform() const
+{
+    QTransform result;
+    result.scale(horizontal_scale_factor_, 1.0);
+    result.rotate(rotation_angle_);
+
+    return result;
+}
+
+/*!
+ * \brief OrientationCorrection::is_flipped_from
+ * Returns whether the two orientations are flipped relative to each other.
+ * Ignores rotation_angle; only checks horizontal_scale_factor_.
+ * \param other
+ * \return
+ */
+bool OrientationCorrection::is_flipped_from(
+        const OrientationCorrection& other) const
+{
+    return (horizontal_scale_factor_ != other.horizontal_scale_factor_);
+}
+
+/*!
+ * \brief OrientationCorrection::get_normalized_rotation_difference
+ * Returns the rotation difference in degrees (this - other), normalized to
+ * 0, 90, 180, or 270.  Ignores the horizontal_scale_factor_.
+ * \param other
+ * \return
+ */
+int OrientationCorrection::get_normalized_rotation_difference(
+        const OrientationCorrection& other) const
+{
+    int degrees_rotation = (int)rotation_angle_ - (int)other.rotation_angle_;
+    if (degrees_rotation < 0)
+        degrees_rotation += 360;
+
+    Q_ASSERT(degrees_rotation == 0 || degrees_rotation == 90 ||
+             degrees_rotation == 180 || degrees_rotation == 270);
+    return degrees_rotation;
+}
 
=== added file 'src/util/orientation.h'
--- src/util/orientation.h	1970-01-01 00:00:00 +0000
+++ src/util/orientation.h	2013-06-07 11:10:22 +0000
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Lucas Beeler <[e-mail]>
+ */
+
+#ifndef GALLERY_ORIENTATION_H_
+#define GALLERY_ORIENTATION_H_
+
+#include <QTransform>
+
+enum Orientation {
+    MIN_ORIENTATION = 1,
+    TOP_LEFT_ORIGIN = 1,
+    TOP_RIGHT_ORIGIN = 2,
+    BOTTOM_RIGHT_ORIGIN = 3,
+    BOTTOM_LEFT_ORIGIN = 4,
+    LEFT_TOP_ORIGIN = 5,
+    RIGHT_TOP_ORIGIN = 6,
+    RIGHT_BOTTOM_ORIGIN = 7,
+    LEFT_BOTTOM_ORIGIN = 8,
+    MAX_ORIENTATION = 8
+};
+
+/*!
+ * \brief The OrientationCorrection struct
+ */
+class OrientationCorrection
+{
+public:
+    static OrientationCorrection FromOrientation(Orientation o);
+    static OrientationCorrection Identity();
+    static Orientation rotate_orientation(Orientation orientation, bool left);
+
+    const double rotation_angle_;
+    const double horizontal_scale_factor_;
+
+    QTransform to_transform() const;
+
+    bool is_flipped_from(const OrientationCorrection& other) const;
+    int get_normalized_rotation_difference(const OrientationCorrection& other) const;
+
+private:
+    OrientationCorrection(double rotation_angle, double horizontal_scale_factor)
+        : rotation_angle_(rotation_angle),
+          horizontal_scale_factor_(horizontal_scale_factor) { }
+};
+
+
+#endif // GALLERY_ORIENTATION_H_
 
=== modified file 'tests/unittests/gallerystandardimageprovider/CMakeLists.txt'
--- tests/unittests/gallerystandardimageprovider/CMakeLists.txt	2013-06-07 11:10:22 +0000
+++ tests/unittests/gallerystandardimageprovider/CMakeLists.txt	2013-06-07 11:10:22 +0000
@@ -10,6 +10,7 @@
     ${gallery_media_src_SOURCE_DIR}
     ${gallery_medialoader_src_SOURCE_DIR}
     ${gallery_photo_src_SOURCE_DIR}
+    ${gallery_util_src_SOURCE_DIR}
     ${GSTLIB_INCLUDE_DIRS}
     )
 
 
=== modified file 'tests/unittests/gallerystandardimageprovider/media-collection.h'
--- tests/unittests/gallerystandardimageprovider/media-collection.h	2013-06-06 06:43:50 +0000
+++ tests/unittests/gallerystandardimageprovider/media-collection.h	2013-06-07 11:10:22 +0000
@@ -22,7 +22,7 @@
 class MediaCollection
 {
 public:
-    MediaCollection(const QDir& directory) {Q_UNUSED(directory);}
+    MediaCollection() {}
 };
 
 #endif
 
=== modified file 'tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp'
--- tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp	2013-06-06 06:43:50 +0000
+++ tests/unittests/gallerystandardimageprovider/tst_gallerystandardimageprovidertest.cpp	2013-06-07 11:10:22 +0000
@@ -73,7 +73,7 @@
     QFETCH(QString, id);
     QFETCH(QString, fileName);
 
-    MediaCollection mediaCollection(QDir("/home/user/Pictures"));
+    MediaCollection mediaCollection;
     PreviewManager previewManager("/home/user/thumbnails", &mediaCollection);
     GalleryStandardImageProvider provider;
     provider.setPreviewManager(&previewManager);