Merge lp:~mhr3/mediascanner/fixes into lp:mediascanner

[Michal Hruby]

A couple of fixes.

A couple of fixes.

[PS Jenkins bot (ps-jenkins)]

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

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mediascanner-ci/76/rebuild

review: Approve (continuous-integration)

[lp:~mhr3/mediascanner/fixes]

397. By Michal Hruby on 2013-10-14

Merge lp:~jamesh/mediascanner/bug-1237484

398. By Michal Hruby on 2013-10-14

Remove the GNetworkMonitor fix which is now duplicated

[James Henstridge (jamesh)]

Looks good.

review: Approve

=== modified file 'src/mediascanner-service/main.cpp'
--- src/mediascanner-service/main.cpp	2013-10-08 14:44:18 +0000
+++ src/mediascanner-service/main.cpp	2013-10-14 09:40:03 +0000
@@ -20,6 +20,7 @@
 
 // GLib based libraries
 #include <grilo.h>
+#include <gio/gio.h>
 #include <gst/pbutils/pbutils.h>
 
 // Boost C++
@@ -701,8 +702,10 @@
                                              available_caps.get(),
                                              GST_CAPS_INTERSECT_FIRST));
 
-        kTraceGSt("mandatory: {1}") % to_string(mandatory_caps);
-        kTraceGSt("common: {1}") % to_string(common_caps);
+        std::string mand_caps_str = to_string(mandatory_caps);
+        std::string common_caps_str = to_string(common_caps);
+        kTraceGSt("mandatory: {1}") % mand_caps_str;
+        kTraceGSt("common: {1}") % common_caps_str;
 
         if (gst_caps_is_empty(common_caps)) {
             // TODO(M5): L10N or maybe trigger plugin installer
@@ -806,6 +809,14 @@
         return false;
     }
 
+    // Make sure the network monitor is initialised early, since it is
+    // not reliable if initialised from a thread.
+    GNetworkMonitor *network_monitor = g_network_monitor_get_default();
+    if (not network_monitor) {
+        kError("Could not initialize GNetworkMonitor");
+        return false;
+    }
+
     // Really check all plugins. Avoid lazy evaluation.
     // Don't abort on missing codecs. We already print a warning.
     VerifyMediaFeatures(list_gst_demuxers(), settings_.mandatory_containers());

=== modified file 'src/mediascanner/commitpolicy.cpp'
--- src/mediascanner/commitpolicy.cpp	2013-09-09 12:17:56 +0000
+++ src/mediascanner/commitpolicy.cpp	2013-10-14 09:40:03 +0000
@@ -185,9 +185,10 @@
                                             (DelayedCommitPolicy *policy) {
     cancel_timeout();
 
-    const Source::OneCallFunction commit_function =
-            std::bind(&WritableMediaIndex::CommitPendingChanges,
-                        media_index_);
+    const Source::OneCallFunction commit_function = [this] () {
+        media_index_->CommitPendingChanges();
+        timeout_id_ = 0;
+    };
 
     due_time_ = Clock::universal_time() + policy->maximium_delay();
     timeout_id_ = Timeout::AddOnce(policy->maximium_delay(), commit_function);

=== modified file 'src/mediascanner/filesystemwalker.cpp'
--- src/mediascanner/filesystemwalker.cpp	2013-10-10 02:31:44 +0000
+++ src/mediascanner/filesystemwalker.cpp	2013-10-14 09:40:03 +0000
@@ -377,9 +377,9 @@
                                    std::placeholders::_1, media, nullptr, &media_properties));
     metadata->add_related(media_properties);
 
-    const GList *const stream_list = gst_discoverer_info_get_stream_list(media);
+    std::unique_ptr<GList, void(*)(GList*)> stream_list(gst_discoverer_info_get_stream_list(media), gst_discoverer_stream_info_list_free);
 
-    for (const GList *l = stream_list; l; l = l->next) {
+    for (const GList *l = stream_list.get(); l; l = l->next) {
         GstDiscovererStreamInfo *const stream =
                 GST_DISCOVERER_STREAM_INFO(l->data);
 
@@ -746,8 +746,9 @@
                                          ScanDetails details) {
     Wrapper<GError> error;
 
-    std::unique_ptr<GstDiscoverer, void(*)(GstDiscoverer*)> discoverer(gst_discoverer_new(GST_SECOND * 25, error.out_param()),
-            [](GstDiscoverer *p) { g_object_unref(p);});
+    const Wrapper<GstDiscoverer> discoverer =
+            take(gst_discoverer_new(GST_SECOND * 25, error.out_param()));
+
     if (!discoverer) {
         const std::string error_message = to_string(error);
         ReportError(format("Cannot create discoverer: {1}") % error_message);
@@ -837,13 +838,13 @@
     if (media) {
         GstDiscovererResult res = gst_discoverer_info_get_result (media.get());
         if (res != GST_DISCOVERER_OK) {
-            kInfo("  Unable to discover \"{1}\", error code: {2}") % path % res;
+            kWarning("  Unable to discover \"{1}\", error code: {2}") % path % res;
             return;
         }
-        GList *const streams = gst_discoverer_info_get_stream_list(media.get());
+        std::unique_ptr<GList, void(*)(GList*)> streams(gst_discoverer_info_get_stream_list(media.get()), gst_discoverer_stream_info_list_free);
 
         // Skip any file that doesn't provide GStreamer compatible streams.
-        if (streams == nullptr) {
+        if (not streams) {
             kDebug("  No media streams found in \"{1}\"") % path;
             return;
         }
@@ -851,11 +852,11 @@
         // File must be an image if duration is zero. Check that.
         if (gst_discoverer_info_get_duration(media) == 0) {
             // No streams at all? That's suspecious, but well.
-            if (not GST_IS_DISCOVERER_VIDEO_INFO(streams->data))
+            if (not GST_IS_DISCOVERER_VIDEO_INFO(streams.get()->data))
                 return;
 
             GstDiscovererVideoInfo *const video_info =
-                    static_cast<GstDiscovererVideoInfo *>(streams->data);
+                    static_cast<GstDiscovererVideoInfo *>(streams.get()->data);
 
             // Duration is zero, but it's also no image? Let's skip!
             if (not gst_discoverer_video_info_is_image(video_info))
@@ -874,8 +875,8 @@
             text << ", gstinfo={result="
                  << gst_discoverer_info_get_result(media);
 
-            GList *streams = gst_discoverer_info_get_stream_list(media.get());
-            text << PrintStreams(streams);
+            std::unique_ptr<GList, void(*)(GList*)> streams(gst_discoverer_info_get_stream_list(media.get()), gst_discoverer_stream_info_list_free);
+            text << PrintStreams(streams.get());
 
             text << "}";
         }

=== modified file 'src/mediascanner/mediaroot.cpp'
--- src/mediascanner/mediaroot.cpp	2013-09-11 09:49:12 +0000
+++ src/mediascanner/mediaroot.cpp	2013-10-14 09:40:03 +0000
@@ -274,8 +274,11 @@
 
     if (volume_monitor_)
         g_signal_handlers_disconnect_by_data(volume_monitor_.get(), this);
-    if (idle_id_)
+
+    if (idle_id_) {
         Idle::Remove(idle_id_);
+        idle_id_ = 0;
+    }
 }
 
 void MediaRootManager::Private::on_init() {

=== modified file 'tests/auto/filesystemscannertest.cpp'
--- tests/auto/filesystemscannertest.cpp	2013-10-08 14:44:18 +0000
+++ tests/auto/filesystemscannertest.cpp	2013-10-14 09:40:03 +0000
@@ -353,6 +353,11 @@
     grl_init(&argc, &argv);
     gst_init(&argc, &argv);
 
+    // Initialise GNetworkMonitor early so it doesn't get initialised
+    // in a thread other than than the main loop.
+    GNetworkMonitor *network_monitor = g_network_monitor_get_default();
+    g_assert(network_monitor != NULL);
+
     mediascanner::filesystemscannertest::SetupTestEnvironments();
 
     return RUN_ALL_TESTS();