Merge lp:~schwann/gallery-app/gallery-datastructure-load into lp:gallery-app

[Günter Schwann]

Load the media object from the DB without checkin for the files (and separate queries)
Do a datastructure / file syetem consitency check in a background thread

Load the whole media collection in go from the DB.
Do a consistency check afterwards in the background.
Gallery now reacts properly when files are deleted on the file system.
Usually the "Loading..." Screen is now shown anymore.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:763
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/331/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/141
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/141/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/141
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/519
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/521
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/521/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/470

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:763
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/332/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/142
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/142
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/142
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/529
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/529/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/476

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:765
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/333/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/143
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/143/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/143
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/539
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/541
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/541/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/487

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:766
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/334/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/144
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/144
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/144/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/144
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/541
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/543
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/543/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/489

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:766
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/335/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/145
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/145/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/145
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/543
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/545
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/545/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/491

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:767
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/336/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/146
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/146/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/146
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/548
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/548/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/494

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

review: Approve (continuous-integration)

[Thomas Moenicke (thomas-moenicke)]

looks like in addMedia the Video* pointer is not really needed

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:768
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/337/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/147
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/147/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/147
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/562
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/564
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/564/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/509

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/gallery-app-autolanding/151/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-autolanding/64
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-autolanding/64/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-autolanding/64
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/565
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/567
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/567/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/511

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:768
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/338/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/148
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/148
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/148/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/148
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/587
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/589
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/589/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/528

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:768
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/339/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/149
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/149/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/149
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/614
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/616
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/616/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/554

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

review: Approve (continuous-integration)

[Günter Schwann (schwann)]

Top approving again - now that jenkins seems to work ok again

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:768
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/340/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-amd64-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/150
        deb: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-armhf-ci/150/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/gallery-app-saucy-i386-ci/150
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/617
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/619
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/619/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/557

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

review: Approve (continuous-integration)

=== modified file 'src/database/media-table.cpp'
--- src/database/media-table.cpp	2013-06-28 12:33:19 +0000
+++ src/database/media-table.cpp	2013-07-02 13:33:30 +0000
@@ -34,45 +34,6 @@
 }
 
 /*!
- * \brief MediaTable::verifyFiles
- * Runs though the table, removes references to files
- * that have been deleted from disk.
- */
-void MediaTable::verifyFiles()
-{
-    QSqlQuery query(*m_db->getDB());
-    QList<qint64> to_delete;
-    query.prepare("SELECT id, filename FROM MediaTable");
-    if (!query.exec())
-        m_db->logSqlError(query);
-
-    // Stat each file. Make a list of files that no longer exist.
-    while (query.next()) {
-        // stat'ing and sync'ing file info over even several hundred photos is an
-        // expensive operation since it involves lots of I/O, so spin the event
-        // loop so that the UI remains responsive
-        QApplication::processEvents();
-
-        qint64 id = query.value(0).toLongLong();
-        QFile file(query.value(1).toString());
-
-        if (!file.exists())
-            to_delete.append(id);
-    }
-
-    // Delete any references to non-existent files.
-    m_db->getDB()->transaction();
-    foreach (qint64 id, to_delete) {
-        // spin the event loop so that the UI remains responsive
-        QApplication::processEvents();
-
-        remove(id);
-    }
-    
-    m_db->getDB()->commit();
-}
-
-/*!
  * \brief MediaTable::getIdForMedia Returns the row ID for the given photo.
  * \param filename
  * \return Returns the row ID for the given photo. If none exists, -1 will be returned.
@@ -263,6 +224,31 @@
 }
 
 /*!
+ * \brief MediaTable::emitAllRows goes through the whole DB and emits a row() signal
+ * for every single row with all the Database
+ */
+void MediaTable::emitAllRows()
+{
+    QSqlQuery query(*m_db->getDB());
+    query.prepare("SELECT * FROM MediaTable");
+    if (!query.exec())
+        m_db->logSqlError(query);
+
+    while (query.next()) {
+        qint64 id = query.value(0).toInt();
+        QString filename = query.value(1).toString();
+        QSize size(query.value(2).toInt(), query.value(3).toInt());
+        QDateTime timestamp;
+        timestamp.setMSecsSinceEpoch(query.value(4).toLongLong());
+        QDateTime exposuretime;
+        exposuretime.setMSecsSinceEpoch(query.value(5).toLongLong());
+        Orientation orientation = static_cast<Orientation>(query.value(6).toInt());
+        qint64 filesize = query.value(7).toInt();
+        emit row(id, filename, size, timestamp, exposuretime, orientation, filesize);
+    }
+}
+
+/*!
  * \brief MediaTable::getRow Gets a row that already exists
  * \param mediaId
  * \param size

=== modified file 'src/database/media-table.h'
--- src/database/media-table.h	2013-06-28 12:33:19 +0000
+++ src/database/media-table.h	2013-07-02 13:33:30 +0000
@@ -37,8 +37,6 @@
 public:
     explicit MediaTable(Database* db, QObject *parent = 0);
 
-    void verifyFiles();
-
     qint64 getIdForMedia(const QString& filename);
 
     qint64 createIdForMedia(const QString& filename, const QDateTime& timestamp,
@@ -63,6 +61,13 @@
 
     QDateTime getExposureTime(qint64 mediaId);
 
+    void emitAllRows();
+
+signals:
+    void row(qint64 mediaId, const QString& filename, const QSize& size,
+             const QDateTime& timestamp, const QDateTime& exposureTime,
+             Orientation originalOrientation, qint64 filesize);
+
 private:
     Database* m_db;
 };

=== modified file 'src/gallery-application.cpp'
--- src/gallery-application.cpp	2013-06-28 11:53:54 +0000
+++ src/gallery-application.cpp	2013-07-02 13:33:30 +0000
@@ -206,7 +206,10 @@
             filterType = MediaSource::Photo;
         m_galleryManager->enableContentLoadFilter(filterType);
     }
+    QApplication::processEvents();
+
     m_galleryManager->postInit();
+    QApplication::processEvents();
     if (m_cmdLineParser->startupTimer())
         qDebug() << "GalleryManager initialized" << m_timer->elapsed() << "ms";
 
@@ -230,4 +233,3 @@
 
     m_timer->restart();
 }
-

=== modified file 'src/gallery-manager.cpp'
--- src/gallery-manager.cpp	2013-07-01 07:40:13 +0000
+++ src/gallery-manager.cpp	2013-07-02 13:33:30 +0000
@@ -193,13 +193,12 @@
         m_database = new Database(m_resource->databaseDirectory(),
                                  m_resource->getRcUrl("sql").path());
         m_mediaFactory->setMediaTable(m_database->getMediaTable());
-        m_database->getMediaTable()->verifyFiles();
         m_defaultTemplate = new AlbumDefaultTemplate();
         m_mediaCollection = new MediaCollection();
 
         initPreviewManager();
+        fillMediaCollection();
         startFileMonitoring();
-        fillMediaCollection();
 
         collectionsInitialised = true;
 
@@ -229,7 +228,7 @@
 EventCollection *GalleryManager::eventCollection()
 {
     if (!m_eventCollection)
-        m_eventCollection = new EventCollection;
+        m_eventCollection = new EventCollection();
 
     return m_eventCollection;
 }
@@ -303,23 +302,10 @@
 {
     Q_ASSERT(m_mediaCollection);
 
-    QSet<DataObject*> photos;
-    foreach (const QString &dirName, m_resource->mediaDirectories()) {
-        QDir mediaDir(dirName);
-        mediaDir.setFilter(QDir::Files);
-        mediaDir.setSorting(QDir::Name);
-
-        const QStringList filenames = mediaDir.entryList();
-        foreach (const QString& filename, filenames) {
-            QFileInfo file(mediaDir, filename);
-            DataObject *media = m_mediaFactory->create(file);
-            if (media) {
-                photos.insert(media);
-            }
-        }
-    }
-
-    m_mediaCollection->addMany(photos);
+    QSet<DataObject*> medias;
+    medias = m_mediaFactory->mediasFromDB();
+    m_mediaCollection->addMany(medias);
+    m_mediaFactory->clear();
 }
 
 /*!
@@ -334,7 +320,11 @@
     m_monitor = new MediaMonitor();
     QObject::connect(m_monitor, SIGNAL(mediaItemAdded(QString)),
                      this, SLOT(onMediaItemAdded(QString)));
+    QObject::connect(m_monitor, SIGNAL(mediaItemRemoved(qint64)),
+                     this, SLOT(onMediaItemRemoved(qint64)));
+
     m_monitor->startMonitoring(m_resource->mediaDirectories());
+    m_monitor->checkConsitency(m_mediaCollection);
 }
 
 /*!
@@ -343,12 +333,19 @@
  */
 void GalleryManager::onMediaItemAdded(QString file)
 {
-    QFileInfo fi(file);
-    MediaSource* media = m_mediaCollection->mediaFromFileinfo(fi);
-    if (media == 0) {
-        media = m_mediaFactory->create(fi);
-    }
-    if (media) {
-        m_mediaCollection->add(media);
-    }
+    if (! m_mediaCollection->containsFile(file)) {
+        QFileInfo fi(file);
+        MediaSource *media = m_mediaFactory->create(fi);
+        if (media)
+            m_mediaCollection->add(media);
+    }
+}
+
+/*!
+ * \brief GalleryManager::onMediaItemRemoved
+ * \param mediaId
+ */
+void GalleryManager::onMediaItemRemoved(qint64 mediaId)
+{
+    m_mediaCollection->destroy(mediaId);
 }

=== modified file 'src/gallery-manager.h'
--- src/gallery-manager.h	2013-06-28 20:38:44 +0000
+++ src/gallery-manager.h	2013-07-02 13:33:30 +0000
@@ -84,6 +84,7 @@
 
 private slots:
     void onMediaItemAdded(QString file);
+    void onMediaItemRemoved(qint64 mediaId);
 
 private:
     GalleryManager(const GalleryManager&);

=== modified file 'src/media-object-factory.cpp'
--- src/media-object-factory.cpp	2013-06-28 12:33:19 +0000
+++ src/media-object-factory.cpp	2013-07-02 13:33:30 +0000
@@ -59,6 +59,43 @@
 }
 
 /*!
+ * \brief MediaObjectFactory::photosFromDB creates a set with all photos and video
+ * stored in the DB.
+ * Someone else needs to take the responsibility to delete all the objects in the set.
+ * You should call clear() afterwards, to remove temporary data.
+ * \return All medias stored in the DB
+ */
+QSet<DataObject *> MediaObjectFactory::mediasFromDB()
+{
+    Q_ASSERT(m_mediaTable);
+
+    m_mediasFromDB.clear();
+
+    connect(m_mediaTable,
+            SIGNAL(row(qint64,QString,QSize,QDateTime,QDateTime,Orientation,qint64)),
+            this,
+            SLOT(addMedia(qint64,QString,QSize,QDateTime,QDateTime,Orientation,qint64)));
+
+    m_mediaTable->emitAllRows();
+
+    disconnect(m_mediaTable,
+               SIGNAL(row(qint64,QString,QSize,QDateTime,QDateTime,Orientation,qint64)),
+               this,
+               SLOT(addMedia(qint64,QString,QSize,QDateTime,QDateTime,Orientation,qint64)));
+
+    return m_mediasFromDB;
+}
+
+/*!
+ * \brief MediaObjectFactory::clear
+ */
+void MediaObjectFactory::clear()
+{
+    clearMetadata();
+    m_mediasFromDB.clear();
+}
+
+/*!
  * \brief MediaObjectFactory::create loads the data for a photo or video file.
  * Creates / updates the database as well.
  * \param file the file to load
@@ -89,13 +126,11 @@
 
     MediaSource *media = 0;
     Photo *photo = 0;
-    Video *video = 0;
     if (mediaType == MediaSource::Photo) {
         photo = new Photo(file);
         media = photo;
     } else {
-        video = new Video(file);
-        media = video;
+        media = new Video(file);
     }
 
     if (id == INVALID_ID) {
@@ -129,6 +164,49 @@
 }
 
 /*!
+ * \brief MediaObjectFactory::addMedia creates a media object, and adds it to the
+ * internal set. This is used for mediasFromDB().
+ * \param mediaId
+ * \param filename
+ * \param size
+ * \param timestamp
+ * \param exposureTime
+ * \param originalOrientation
+ * \param filesize
+ * \return
+ */
+void MediaObjectFactory::addMedia(qint64 mediaId, const QString &filename,
+                                  const QSize &size, const QDateTime &timestamp,
+                                  const QDateTime &exposureTime,
+                                  Orientation originalOrientation, qint64 filesize)
+{
+    Q_UNUSED(filesize);
+
+    QFileInfo file(filename);
+    MediaSource::MediaType mediaType = MediaSource::Photo;
+    if (Video::isCameraVideo(file))
+        mediaType = MediaSource::Video;
+
+    MediaSource *media = 0;
+    Photo *photo = 0;
+    if (mediaType == MediaSource::Photo) {
+        photo = new Photo(file);
+        media = photo;
+    } else {
+        media = new Video(file);
+    }
+
+    media->setSize(size);
+    media->setFileTimestamp(timestamp);
+    media->setExposureDateTime(exposureTime);
+    if (mediaType == MediaSource::Photo)
+        photo->setOriginalOrientation(originalOrientation);
+    media->setId(mediaId);
+
+    m_mediasFromDB.insert(media);
+}
+
+/*!
  * \brief MediaObjectFactory::clearMetadata resets all memeber variables
  * regarding metadata
  */

=== modified file 'src/media-object-factory.h'
--- src/media-object-factory.h	2013-06-26 08:59:08 +0000
+++ src/media-object-factory.h	2013-07-02 13:33:30 +0000
@@ -25,6 +25,7 @@
 
 #include <QDateTime>
 #include <QFileInfo>
+#include <QObject>
 #include <QSize>
 
 class MediaTable;
@@ -32,17 +33,27 @@
 /*!
  * \brief The MediaObjectFactory creates phot and video objects
  */
-class MediaObjectFactory
+class MediaObjectFactory : public QObject
 {
+    Q_OBJECT
+
 public:
     explicit MediaObjectFactory();
 
     void setMediaTable(MediaTable *mediaTable);
     void enableContentLoadFilter(MediaSource::MediaType filterType);
 
+    QSet<DataObject*> mediasFromDB();
+    void clear();
+
     MediaSource *create(const QFileInfo& file);
 
-private:
+private slots:
+    void addMedia(qint64 mediaId, const QString& filename, const QSize& size,
+                  const QDateTime& timestamp, const QDateTime& exposureTime,
+                  Orientation originalOrientation, qint64 filesize);
+
+private:    
     void clearMetadata();
     bool readPhotoMetadata(const QFileInfo &file);
     bool readVideoMetadata(const QFileInfo &file);
@@ -56,6 +67,8 @@
 
     MediaSource::MediaType m_filterType;
 
+    QSet<DataObject*> m_mediasFromDB;
+
     friend class tst_MediaObjectFactory;
 };
 

=== modified file 'src/media/media-collection.cpp'
--- src/media/media-collection.cpp	2013-06-10 07:37:09 +0000
+++ src/media/media-collection.cpp	2013-07-02 13:33:30 +0000
@@ -137,12 +137,22 @@
  * \param file_to_load
  * \return
  */
-MediaSource *MediaCollection::mediaFromFileinfo(const QFileInfo& file)
+const MediaSource *MediaCollection::mediaFromFileinfo(const QFileInfo& file) const
 {
     return m_fileMediaMap.value(file.absoluteFilePath(), 0);
 }
 
 /*!
+ * \brief MediaCollection::containsFile
+ * \param filename
+ * \return
+ */
+bool MediaCollection::containsFile(const QString &filename) const
+{
+    return m_fileMediaMap.contains(filename);
+}
+
+/*!
  * \reimp
  */
 void MediaCollection::addMany(const QSet<DataObject *> &objects)
@@ -154,3 +164,24 @@
 
     DataCollection::addMany(objects);
 }
+
+/*!
+ * \brief MediaCollection::destroy
+ * \param media
+ */
+void MediaCollection::destroy(MediaSource *media)
+{
+    SourceCollection::destroy(media, true, true);
+}
+
+/*!
+ * \brief MediaCollection::remove
+ * \param id
+ */
+void MediaCollection::destroy(qint64 id)
+{
+    if (m_idMap.contains(id)) {
+        MediaSource *media = qobject_cast<MediaSource*>(m_idMap[id]);
+        SourceCollection::destroy(media, true, true);
+    }
+}

=== modified file 'src/media/media-collection.h'
--- src/media/media-collection.h	2013-06-10 06:32:08 +0000
+++ src/media/media-collection.h	2013-07-02 13:33:30 +0000
@@ -44,10 +44,14 @@
     static bool exposureDateTimeDescendingComparator(DataObject* a, DataObject* b);
 
     MediaSource* mediaForId(qint64 id);
-    MediaSource* mediaFromFileinfo(const QFileInfo &file);
+    const MediaSource* mediaFromFileinfo(const QFileInfo &file) const;
+    bool containsFile(const QString& filename) const;
 
     virtual void addMany(const QSet<DataObject*>& objects);
 
+    void destroy(MediaSource *media);
+    void destroy(qint64 id);
+
 protected slots:
     virtual void notifyContentsChanged(const QSet<DataObject*>* added,
                                        const QSet<DataObject*>* removed);

=== modified file 'src/media/media-monitor.cpp'
--- src/media/media-monitor.cpp	2013-06-28 11:53:54 +0000
+++ src/media/media-monitor.cpp	2013-07-02 13:33:30 +0000
@@ -18,14 +18,17 @@
  */
 
 #include "media-monitor.h"
+#include "media-collection.h"
+#include "media-source.h"
 
 #include <QDir>
+#include <QElapsedTimer>
+#include <QFileInfo>
 #include <QSet>
 #include <QString>
 
 /*!
  * \brief MediaMonitor::MediaMonitor
- * \param targetDirectory
  */
 MediaMonitor::MediaMonitor(QObject *parent)
     : QObject(parent),
@@ -38,6 +41,8 @@
 
     QObject::connect(m_worker, SIGNAL(mediaItemAdded(QString)),
                      this, SIGNAL(mediaItemAdded(QString)), Qt::QueuedConnection);
+    QObject::connect(m_worker, SIGNAL(mediaItemRemoved(qint64)),
+                     this, SIGNAL(mediaItemRemoved(qint64)), Qt::QueuedConnection);
 
     m_workerThread.start(QThread::LowPriority);
 }
@@ -52,7 +57,8 @@
 }
 
 /*!
- * \brief MediaMonitor::startMonitoring
+ * \brief MediaMonitor::startMonitoring starts monitoring the given directories
+ * new and delted files
  * \param targetDirectories
  */
 void MediaMonitor::startMonitoring(const QStringList &targetDirectories)
@@ -61,10 +67,20 @@
                               Q_ARG(QStringList, targetDirectories));
 }
 
+/*!
+ * \brief MediaMonitor::checkConsitency checks the given datastructure, if it is
+ * in sync with the file system (files got added, deleted meanwhile)
+ * \param mediaCollection
+ */
+void MediaMonitor::checkConsitency(const MediaCollection *mediaCollection)
+{
+    m_worker->setMediaCollection(mediaCollection);
+    QMetaObject::invokeMethod(m_worker, "checkConsitency", Qt::QueuedConnection);
+}
+
 
 /*!
  * \brief MediaMonitor::MediaMonitor
- * \param targetDirectory
  */
 MediaMonitorWorker::MediaMonitorWorker(QObject *parent)
     : QObject(parent),
@@ -89,6 +105,15 @@
 }
 
 /*!
+ * \brief MediaMonitorWorker::setMediaCollection
+ * \param mediaCollection
+ */
+void MediaMonitorWorker::setMediaCollection(const MediaCollection *mediaCollection)
+{
+    m_mediaCollection = mediaCollection;
+}
+
+/*!
  * \brief MediaMonitor::startMonitoring
  * \param targetDirectories
  */
@@ -105,6 +130,16 @@
 }
 
 /*!
+ * \brief MediaMonitorWorker::checkConsitency
+ * \param mediaCollection
+ */
+void MediaMonitorWorker::checkConsitency()
+{
+    checkForRemovedMedias();
+    checkForNewMedias();
+}
+
+/*!
  * \brief MediaMonitor::onDirectoryEvent
  * \param eventSource
  */
@@ -120,9 +155,17 @@
 {
     QStringList new_manifest = getManifest(m_targetDirectories);
 
-    QStringList difference = subtractManifest(new_manifest, m_manifest);
-    for (int i = 0; i < difference.size(); i++)
-        emit mediaItemAdded(difference.at(i));
+    QStringList added = subtractManifest(new_manifest, m_manifest);
+    for (int i = 0; i < added.size(); i++)
+        emit mediaItemAdded(added.at(i));
+
+    QStringList removed = subtractManifest(m_manifest, new_manifest);
+    for (int i = 0; i < removed.size(); i++) {
+        QFileInfo file(removed.at(i));
+        const MediaSource *media = m_mediaCollection->mediaFromFileinfo(file);
+        if (media)
+            emit mediaItemRemoved(media->id());
+    }
 
     m_manifest = new_manifest;
 }
@@ -158,3 +201,31 @@
     result.subtract(QSet<QString>::fromList(m2));
     return QStringList(result.toList());
 }
+
+/*!
+ * \brief MediaMonitorWorker::checkForNewMedias checks for files in the filesystem
+ * that are not in the datastructure
+ * \param mediaCollection
+ */
+void MediaMonitorWorker::checkForNewMedias()
+{
+    foreach (const QString& file, m_manifest) {
+        if (!m_mediaCollection->containsFile(file))
+            emit mediaItemAdded(file);
+    }
+}
+
+/*!
+ * \brief MediaMonitorWorker::checkForRemovedMedias checks if there are files in
+ * the datastructure, but not in the file system
+ */
+void MediaMonitorWorker::checkForRemovedMedias()
+{
+    const QList<DataObject*> medias = m_mediaCollection->getAll();
+    foreach (const DataObject* obj, medias) {
+        const MediaSource *media = qobject_cast<const MediaSource*>(obj);
+        Q_ASSERT(media);
+        if (!m_manifest.contains(media->file().absoluteFilePath()))
+            emit mediaItemRemoved(media->id());
+    }
+}

=== modified file 'src/media/media-monitor.h'
--- src/media/media-monitor.h	2013-06-28 11:53:54 +0000
+++ src/media/media-monitor.h	2013-07-02 13:33:30 +0000
@@ -26,11 +26,13 @@
 #include <QThread>
 #include <QTimer>
 
+class MediaCollection;
 class MediaMonitorWorker;
 
 /*!
- * \brief The MediaMonitor class monitor directories for added files
- * All it's time consuming tasks are automaticly run in a separate thread
+ * \brief The MediaMonitor class monitor directories for added files. And does a
+ * check if the files in the datastructure and on thef ile system are in sync.
+ * All this is done in an extra thread.
  */
 class MediaMonitor : public QObject
 {
@@ -41,9 +43,11 @@
     virtual ~MediaMonitor();
 
     void startMonitoring(const QStringList& targetDirectories);
+    void checkConsitency(const MediaCollection *mediaCollection);
 
 signals:
     void mediaItemAdded(QString newItem);
+    void mediaItemRemoved(qint64 mediaId);
 
 private:
     MediaMonitorWorker* m_worker;
@@ -63,25 +67,31 @@
     MediaMonitorWorker(QObject *parent=0);
     virtual ~MediaMonitorWorker();
 
+    void setMediaCollection(const MediaCollection *mediaCollection);
+
 public slots:
     void startMonitoring(const QStringList& targetDirectories);
+    void checkConsitency();
 
 signals:
     void mediaItemAdded(QString newItem);
+    void mediaItemRemoved(qint64 mediaId);
 
 private slots:
     void onDirectoryEvent(const QString& eventSource);
     void onFileActivityCeased();
 
 private:
-    static QStringList getManifest(const QStringList& dirs);
-    static QStringList subtractManifest(const QStringList& m1,
-                                        const QStringList& m2);
+    QStringList getManifest(const QStringList& dirs);
+    QStringList subtractManifest(const QStringList& m1, const QStringList& m2);
+    void checkForNewMedias();
+    void checkForRemovedMedias();
 
     QStringList m_targetDirectories;
     QFileSystemWatcher m_watcher;
     QStringList m_manifest;
     QTimer m_fileActivityTimer;
+    const MediaCollection *m_mediaCollection;
 };
 
 #endif // GALLERY_MEDIA_MONITOR_H_

=== modified file 'src/photo/photo-caches.cpp'
--- src/photo/photo-caches.cpp	2013-06-10 07:59:26 +0000
+++ src/photo/photo-caches.cpp	2013-07-02 13:33:30 +0000
@@ -102,7 +102,7 @@
 
     m_file.dir().mkdir(ORIGINAL_DIR);
 
-    return rename(m_file, m_originalFile);
+    return copy(m_file, m_originalFile);
 }
 
 /*!

=== modified file 'src/qml/qml-media-collection-model.cpp'
--- src/qml/qml-media-collection-model.cpp	2013-06-11 19:44:28 +0000
+++ src/qml/qml-media-collection-model.cpp	2013-07-02 13:33:30 +0000
@@ -93,7 +93,7 @@
     MediaSource* media = VariantToObject<MediaSource*>(vmedia);
 
     if (media != NULL)
-        GalleryManager::instance()->mediaCollection()->destroy(media, true, true);
+        GalleryManager::instance()->mediaCollection()->destroy(media);
 }
 
 /*!

=== modified file 'tests/autopilot/gallery_app/emulators/gallery_utils.py'
--- tests/autopilot/gallery_app/emulators/gallery_utils.py	2013-06-21 16:00:49 +0000
+++ tests/autopilot/gallery_app/emulators/gallery_utils.py	2013-07-02 13:33:30 +0000
@@ -119,12 +119,7 @@
     def get_first_image_in_event_view(self):
         """Returns the first photo of the gallery."""
         event = self.get_first_event()
-        list_view = event.get_children_by_type("QQuickListView")[0]
-        item = list_view.get_children_by_type("QQuickItem")[0]
-        first_delegate = item.get_children_by_type("QQuickItem",
-                                                   objectName="eventPhoto")[0]
-        first_photo = first_delegate.get_children_by_type("UbuntuShape")[0]
-        return first_photo
+        return event.select_many("OrganicItemInteraction")[1]
 
     def get_all_albums(self):
         """Returns all albums in the albums view"""

=== modified file 'tests/autopilot/gallery_app/tests/test_events_view.py'
--- tests/autopilot/gallery_app/tests/test_events_view.py	2013-06-26 09:02:33 +0000
+++ tests/autopilot/gallery_app/tests/test_events_view.py	2013-07-02 13:33:30 +0000
@@ -47,6 +47,11 @@
         first_photo = self.events_view.get_first_image_in_event_view()
         self.click_item(first_photo)
 
+    def get_delete_dialog(self):
+        delete_dialog = self.gallery_utils.get_delete_dialog()
+        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
+        return delete_dialog
+
     def click_delete_action(self):
         trash_button = self.events_view.get_toolbar_delete_button()
         self.click_item(trash_button)
@@ -69,8 +74,7 @@
         self.click_first_photo()
         self.click_delete_action()
 
-        delete_dialog = self.events_view.get_delete_dialog()
-        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
+        delete_dialog = self.get_delete_dialog()
 
         cancel_item = self.events_view.get_delete_dialog_cancel_button()
         self.click_item(cancel_item)
@@ -83,8 +87,7 @@
 
         self.click_delete_action()
 
-        delete_dialog = self.events_view.get_delete_dialog()
-        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
+        delete_dialog = self.get_delete_dialog()
 
         delete_item = self.events_view.get_delete_dialog_delete_button()
         self.click_item(delete_item)

=== modified file 'tests/autopilot/gallery_app/tests/test_photo_viewer.py'
--- tests/autopilot/gallery_app/tests/test_photo_viewer.py	2013-06-26 09:02:33 +0000
+++ tests/autopilot/gallery_app/tests/test_photo_viewer.py	2013-07-02 13:33:30 +0000
@@ -52,6 +52,11 @@
     def setUp(self):
         super(TestPhotoViewer, self).setUp()
 
+    def get_delete_dialog(self):
+        delete_dialog = self.photo_viewer.get_delete_dialog()
+        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
+        return delete_dialog
+
     def test_nav_bar_back_button(self):
         """Clicking the back button must close the photo."""
         photo_viewer = self.photo_viewer.get_main_photo_viewer()
@@ -68,8 +73,7 @@
         self.pointing_device.move_to_object(trash_button)
         self.pointing_device.click()
 
-        delete_dialog = self.photo_viewer.get_delete_dialog()
-        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
+        delete_dialog = self.get_delete_dialog()
 
         cancel_item = self.photo_viewer.get_delete_popover_cancel_item()
         self.click_item(cancel_item)
@@ -82,8 +86,7 @@
         self.pointing_device.move_to_object(trash_button)
         self.pointing_device.click()
 
-        delete_dialog = self.photo_viewer.get_delete_dialog()
-        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
+        delete_dialog = self.get_delete_dialog()
 
         delete_item = self.photo_viewer.get_delete_popover_delete_item()
         self.click_item(delete_item)
@@ -94,8 +97,7 @@
         self.reveal_toolbar()
         self.pointing_device.click_object(trash_button)
 
-        delete_dialog = self.photo_viewer.get_delete_dialog()
-        self.assertThat(delete_dialog.visible, Eventually(Equals(True)))
+        delete_dialog = self.get_delete_dialog()
 
         delete_item = self.photo_viewer.get_delete_popover_delete_item()
         self.click_item(delete_item)

=== modified file 'tests/autopilot/gallery_app/tests/test_photos_view.py'
--- tests/autopilot/gallery_app/tests/test_photos_view.py	2013-06-26 08:59:08 +0000
+++ tests/autopilot/gallery_app/tests/test_photos_view.py	2013-07-02 13:33:30 +0000
@@ -60,6 +60,11 @@
         trash_button = self.photos_view.get_toolbar_delete_button()
         self.click_item(trash_button)
 
+    def get_delete_dialog(self):
+        delete_dialog = self.gallery_utils.get_delete_dialog()
+        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
+        return delete_dialog
+
     def test_open_photo(self):
         self.click_first_photo()
         photo_viewer = self.photos_view.get_main_photo_viewer()
@@ -83,8 +88,7 @@
         self.click_first_photo()
         self.click_delete_action()
 
-        delete_dialog = self.photos_view.get_delete_dialog()
-        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
+        delete_dialog = self.get_delete_dialog()
 
         cancel_item = self.photos_view.get_delete_dialog_cancel_button()
         self.click_item(cancel_item)
@@ -97,8 +101,7 @@
 
         self.click_delete_action()
 
-        delete_dialog = self.photos_view.get_delete_dialog()
-        self.assertThat(delete_dialog.opacity, Eventually(Equals(1)))
+        delete_dialog = self.get_delete_dialog()
 
         delete_item = self.photos_view.get_delete_dialog_delete_button()
         self.click_item(delete_item)

=== modified file 'tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp'
--- tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp	2013-06-28 12:33:19 +0000
+++ tests/unittests/mediaobjectfactory/tst_mediaobjectfactory.cpp	2013-07-02 13:33:30 +0000
@@ -41,6 +41,7 @@
     void readPhotoMetadata();
     void readVideoMetadata();
     void enableContentLoadFilter();
+    void addMedia();
 
 private:
     MediaTable *m_mediaTable;
@@ -143,6 +144,34 @@
     QVERIFY(media == 0);
 }
 
+void tst_MediaObjectFactory::addMedia()
+{
+    qint64 id = 123;
+    QString filename("/some/photo.jpg");
+    QSize size(320, 200);
+    QDateTime timestamp(QDate(2013, 02, 03), QTime(12, 12, 12));
+    QDateTime exposureTime(QDate(2013, 03, 04), QTime(1, 2, 3));
+    Orientation originalOrientation(BOTTOM_RIGHT_ORIGIN);
+    qint64 filesize = 2048;
+
+    m_factory->addMedia(id, filename, size, timestamp,
+                                             exposureTime, originalOrientation,
+                                             filesize);
+
+    QCOMPARE(m_factory->m_mediasFromDB.size(), 1);
+    QSet<DataObject*>::iterator it;
+    it = m_factory->m_mediasFromDB.begin();
+    DataObject *obj = *it;
+    Photo *photo = qobject_cast<Photo*>(obj);
+    QVERIFY(photo != 0);
+    QCOMPARE(photo->id(), id);
+    QCOMPARE(photo->path().toLocalFile(), filename);
+    QCOMPARE(photo->size(), size);
+    QCOMPARE(photo->exposureDateTime(), exposureTime);
+    QCOMPARE(photo->fileTimestamp(), timestamp);
+    QCOMPARE(photo->orientation(), originalOrientation);
+}
+
 QTEST_MAIN(tst_MediaObjectFactory);
 
 #include "tst_mediaobjectfactory.moc"

=== modified file 'tests/unittests/stubs/gallery-manager_stub.cpp'
--- tests/unittests/stubs/gallery-manager_stub.cpp	2013-06-28 20:38:44 +0000
+++ tests/unittests/stubs/gallery-manager_stub.cpp	2013-07-02 13:33:30 +0000
@@ -119,3 +119,8 @@
 {
     Q_UNUSED(file);
 }
+
+void GalleryManager::onMediaItemRemoved(qint64 mediaId)
+{
+    Q_UNUSED(mediaId);
+}

=== modified file 'tests/unittests/stubs/media-table_stub.cpp'
--- tests/unittests/stubs/media-table_stub.cpp	2013-06-28 12:33:19 +0000
+++ tests/unittests/stubs/media-table_stub.cpp	2013-07-02 13:33:30 +0000
@@ -51,10 +51,6 @@
     mediaFakeTable.clear();
 }
 
-void MediaTable::verifyFiles()
-{
-}
-
 qint64 MediaTable::getIdForMedia(const QString& filename)
 {
     foreach (const MediaDataRow &row, mediaFakeTable) {
@@ -109,6 +105,10 @@
 {
 }
 
+void MediaTable::emitAllRows()
+{
+}
+
 void MediaTable::getRow(qint64 mediaId, QSize& size, Orientation& 
                          originalOrientation, QDateTime& fileTimestamp, QDateTime& exposureDateTime)
 {