Merge lp:~jpakkane/mediascanner/quickfix into lp:mediascanner

[Jussi Pakkanen]

Quickfix for crasher.

Quickfix for crasher. Behaviour should not be impacted.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:382
http://jenkins.qa.ubuntu.com/job/mediascanner-ci/56/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-i386-ci/56

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediascanner-ci/56/rebuild

review: Approve (continuous-integration)

[lp:~jpakkane/mediascanner/quickfix]

383. By Jussi Pakkanen on 2013-09-09

Try to recreate GstDiscoverer instead of exiting.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:383
http://jenkins.qa.ubuntu.com/job/mediascanner-ci/57/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-amd64-ci/57
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-armhf-ci/57
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-armhf-ci/57/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-i386-ci/57

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediascanner-ci/57/rebuild

review: Approve (continuous-integration)

[lp:~jpakkane/mediascanner/quickfix]

384. By Jussi Pakkanen on 2013-09-09

Do not reuse gst_discoverers.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:384
http://jenkins.qa.ubuntu.com/job/mediascanner-ci/58/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-amd64-ci/58
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-armhf-ci/58
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-armhf-ci/58/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-saucy-i386-ci/58

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mediascanner-ci/58/rebuild

review: Approve (continuous-integration)

[Paweł Stołowski (stolowski)]

Looks good. +1

review: Approve

=== modified file 'src/mediascanner/filesystemwalker.cpp'
--- src/mediascanner/filesystemwalker.cpp	2013-08-23 07:49:06 +0000
+++ src/mediascanner/filesystemwalker.cpp	2013-09-09 14:58:26 +0000
@@ -40,6 +40,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include <memory>
 
 // Media Scanner Library
 #include "mediascanner/glibutils.h"
@@ -160,7 +161,6 @@
 
     void take_file_task(const std::string &path);
 
-    bool SetupDiscoverer();
     void CancelDiscoverer();
 
     void ScanDirectory(Wrapper<GFile> directory, ScanDetails details);
@@ -190,7 +190,6 @@
     const ErrorFunction report_fatal_error_;
     const Wrapper<GCancellable> cancellable_;
     const MetadataResolverPtr metadata_resolver_;
-    Wrapper<GstDiscoverer> discoverer_;
     const TaskManagerPtr file_task_manager_;
     const TaskManagerPtr index_task_manager_;
     const TaskFacadePtr index_task_facade_;
@@ -425,25 +424,6 @@
             (index_task_facade_->bind(task, report_fatal_error_));
 }
 
-bool FileSystemWalker::Private::SetupDiscoverer() {
-    Wrapper<GError> error;
-
-    discoverer_ = gst_discoverer_new(1 * GST_SECOND, error.out_param());
-
-    if (not discoverer_) {
-        const std::string error_message = to_string(error);
-        ReportError(format("Cannot create discoverer: {1}") % error_message);
-        return false;
-    }
-
-    return true;
-}
-
-void FileSystemWalker::Private::CancelDiscoverer() {
-    gst_discoverer_stop(discoverer_.get());
-    discoverer_.reset();
-}
-
 bool FileSystemWalker::start() {
     return d->start(Private::ScanAll);
 }
@@ -517,9 +497,6 @@
 
     error_message_.clear();
 
-    if (not SetupDiscoverer())
-        return false;
-
     push_file_task(&Private::ScanDirectory, media_root().file(), details);
 
     file_task_manager_->AppendGroupedTask
@@ -544,8 +521,6 @@
     const std::string root_path = media_root_.path();
     kInfo("Finished scanning directories below \"{1}\".") % root_path;
 
-    CancelDiscoverer();
-
     // Wakeup joiners
     g_mutex_lock(&mutex_);
     walking_ = false;
@@ -764,13 +739,20 @@
 
 void FileSystemWalker::Private::ScanFile(Wrapper<GFile> file,
                                          ScanDetails details) {
+    Wrapper<GError> error;
+
+    std::unique_ptr<GstDiscoverer, void(*)(GstDiscoverer*)> discoverer(gst_discoverer_new(GST_SECOND, error.out_param()),
+            [](GstDiscoverer *p) { g_object_unref(p);});
+    if (!discoverer) {
+        const std::string error_message = to_string(error);
+        ReportError(format("Cannot create discoverer: {1}") % error_message);
+        return;
+    }
     const std::string path = get_path(file.get());
     take_file_task(path);
 
     kDebug("  Scanning \"{1}\"") % path;
 
-    Wrapper<GError> error;
-
     const Wrapper<GFileInfo> file_info =
             take(g_file_query_info(file.get(), "standard::*,etag::*,time::*",
                                    G_FILE_QUERY_INFO_NONE, cancellable_.get(),
@@ -837,7 +819,7 @@
     // FIXME(M5): Obey ScanStreams flag
     // FIXME(M5): Discover in background
     const Wrapper<GstDiscovererInfo> media =
-            take(gst_discoverer_discover_uri(discoverer_.get(), url.c_str(),
+            take(gst_discoverer_discover_uri(discoverer.get(), url.c_str(),
                                              error.out_param()));
 
     if (error) {