Merge lp:~renatofilho/mediaplayer-app/fix-1182961 into lp:mediaplayer-app

[Renato Araujo Oliveira Filho]

Check if the uri passed as argument is a valid file before play it.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:85
http://jenkins.qa.ubuntu.com/job/mediaplayer-app-ci/54/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-amd64-ci/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/53
        deb: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-armhf-ci/53/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediaplayer-app-raring-i386-ci/53
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner/1605

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

review: Approve (continuous-integration)

[Omer Akram (om26er)]

WFM +1

=== modified file 'src/mediaplayer.cpp'
--- src/mediaplayer.cpp	2013-02-26 19:15:41 +0000
+++ src/mediaplayer.cpp	2013-05-22 17:54:27 +0000
@@ -83,10 +83,19 @@
     m_view->setTitle("Media Player");
     if (args.count() >= 2) {
         QUrl uri(args[1]);
-        if (uri.isRelative()) {
-            uri = QUrl::fromLocalFile(QDir::current().absoluteFilePath(args[1]));
+        if (uri.isValid()) {
+            QFileInfo info(uri.toString());
+            if (info.exists() && info.isFile()) {
+                if (uri.isRelative()) {
+                    uri = QUrl::fromLocalFile(QDir::current().absoluteFilePath(args[1]));
+                }
+                m_view->rootContext()->setContextProperty("playUri", uri);
+            } else {
+                qWarning() << "File not found:" << uri << info.exists() << info.isFile();
+            }
+        } else {
+            qWarning() << "Invalid uri:" << uri;
         }
-        m_view->rootContext()->setContextProperty("playUri", uri);
     }
 
     m_view->rootContext()->setContextProperty("screenWidth", m_view->size().width());