Merge lp:~artmello/gallery-app/gallery-app-remove_sdcard_during_load into lp:gallery-app

[Arthur Mello]

Do not create objects if the file was removed from the time the create was requested and when it was started

Do not create objects if the file was removed from the time the create was requested and when it was started

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1135
http://jenkins.qa.ubuntu.com/job/gallery-app-ci/1104/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-amd64-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-armhf-ci/32/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/gallery-app-vivid-i386-ci/32/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-vivid-touch/105
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-vivid/468/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-click-autopilot-runner-mako/744
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-click-builder-vivid-armhf/201
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/17456
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-amd64/566/console

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/media-object-factory.cpp'
--- src/media-object-factory.cpp	2015-01-25 20:09:25 +0000
+++ src/media-object-factory.cpp	2015-01-26 16:47:14 +0000
@@ -177,6 +177,8 @@
     Q_ASSERT(m_mediaTable);
 
     QFileInfo file(path);
+    if(!file.exists())
+        return;
 
     clearMetadata();
 
 
=== modified file 'src/media/media-collection.cpp'
--- src/media/media-collection.cpp	2015-01-23 20:00:50 +0000
+++ src/media/media-collection.cpp	2015-01-26 16:47:14 +0000
@@ -161,6 +161,21 @@
 /*!
  * \reimp
  */
+void MediaCollection::add(DataObject *object)
+{
+    MediaSource* media = qobject_cast<MediaSource*>(object);
+    if (media->file().exists()) {
+        m_idMap.insert(media->id(), media);
+        DataCollection::add(object);
+    } else {
+        m_mediaTable->remove(media->id());
+        media->deleteLater();
+    }
+}
+
+/*!
++ * \reimp
++ */
 void MediaCollection::addMany(const QSet<DataObject *> &objects)
 {
     foreach (DataObject* data, objects) {
 
=== modified file 'src/media/media-collection.h'
--- src/media/media-collection.h	2015-01-23 20:00:50 +0000
+++ src/media/media-collection.h	2015-01-26 16:47:14 +0000
@@ -48,6 +48,7 @@
     const MediaSource* mediaFromFileinfo(const QFileInfo &file) const;
     bool containsFile(const QString& filename) const;
 
+    virtual void add(DataObject* object);
     virtual void addMany(const QSet<DataObject*>& objects);
 
     void destroy(MediaSource *media, bool destroy_backing);