Merge lp:~phablet-team/media-hub/fix-1546963 into lp:media-hub

[Jim Hodapp]

Only call encode_uri() for local files, pass everything else straight through unmodified.

Only call encode_uri() for local files, pass everything else straight through unmodified.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:174
http://jenkins.qa.ubuntu.com/job/media-hub-ci/398/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/238
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/238
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/238/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/238

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/398/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

LGTM

review: Approve

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

Small not, see inline comment.

review: Needs Fixing

[lp:~phablet-team/media-hub/fix-1546963]

175. By Jim Hodapp on 2016-03-07

Address review comment

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:175
http://jenkins.qa.ubuntu.com/job/media-hub-ci/400/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/240
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/240
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/240/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/240

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/400/rebuild

review: Approve (continuous-integration)

[lp:~phablet-team/media-hub/fix-1546963]

176. By Jim Hodapp on 2016-03-07

Address last review comment

177. By Jim Hodapp on 2016-03-07

One more fix

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:176
http://jenkins.qa.ubuntu.com/job/media-hub-ci/402/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/242
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/242
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/242/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/242

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/402/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:177
http://jenkins.qa.ubuntu.com/job/media-hub-ci/403/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-amd64-ci/243
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/243
        deb: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-armhf-ci/243/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/media-hub-vivid-i386-ci/243

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/media-hub-ci/403/rebuild

review: Approve (continuous-integration)

[Konrad Zapałowicz (kzapalowicz)]

review: Approve

[lp:~phablet-team/media-hub/fix-1546963]

178. By Jim Hodapp on 2016-03-07

Add a comment as to why we first decode a URI before encoding it

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

=== modified file 'src/core/media/gstreamer/playbin.cpp'
--- src/core/media/gstreamer/playbin.cpp	2016-02-22 18:34:11 +0000
+++ src/core/media/gstreamer/playbin.cpp	2016-03-07 21:05:50 +0000
@@ -467,23 +467,25 @@
     if (current_uri and do_pipeline_reset)
         reset_pipeline();
 
-    std::string encoded_uri;
+    std::string tmp_uri{uri};
     media::UriCheck::Ptr uri_check{std::make_shared<media::UriCheck>(uri)};
-    if (uri_check->is_encoded())
+    if (uri_check->is_local_file())
     {
-        encoded_uri = decode_uri(uri);
+        if (uri_check->is_encoded())
+        {
+            // First decode the URI just in case it's partially encoded already
+            tmp_uri = decode_uri(uri);
 #ifdef VERBOSE_DEBUG
-        std::cout << "File URI was encoded, now decoded: " << encoded_uri << std::endl;
+            std::cout << "File URI was encoded, now decoded: " << tmp_uri << std::endl;
 #endif
-        encoded_uri = encode_uri(encoded_uri);
+        }
+        tmp_uri = encode_uri(tmp_uri);
     }
-    else
-        encoded_uri = encode_uri(uri);
 
-    g_object_set(pipeline, "uri", encoded_uri.c_str(), NULL);
-    if (is_video_file(encoded_uri))
+    g_object_set(pipeline, "uri", tmp_uri.c_str(), NULL);
+    if (is_video_file(tmp_uri))
         file_type = MEDIA_FILE_TYPE_VIDEO;
-    else if (is_audio_file(encoded_uri))
+    else if (is_audio_file(tmp_uri))
         file_type = MEDIA_FILE_TYPE_AUDIO;
 
     request_headers = headers;