Merge lp:~fboucault/qtubuntu-camera/ensure_directories_exist into lp:qtubuntu-camera

[Florian Boucault]

Make sure that video and picture directories exist before writing to them.

[Jim Hodapp (jhodapp)]

Works, looks good...thanks!

review: Approve (code)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-ci/86/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-camera-utopic-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtubuntu-camera-ci/86/rebuild

review: Approve (continuous-integration)

=== modified file 'src/storagemanager.cpp'
--- src/storagemanager.cpp	2014-07-29 18:08:39 +0000
+++ src/storagemanager.cpp	2014-07-31 19:18:38 +0000
@@ -36,8 +36,11 @@
 QString StorageManager::nextPhotoFileName(const QString &directoy)
 {
     m_directory = directoy;
-    if (m_directory.isEmpty())
+    if (m_directory.isEmpty()) {
         m_directory = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation) + "/" + QCoreApplication::applicationName();
+        QDir dir;
+        dir.mkpath(m_directory);
+    }
 
     return nextMediaFileName(photoBase, photoExtension);
 }
@@ -45,8 +48,11 @@
 QString StorageManager::nextVideoFileName(const QString &directoy)
 {
     m_directory = directoy;
-    if (m_directory.isEmpty())
+    if (m_directory.isEmpty()) {
         m_directory = QStandardPaths::writableLocation(QStandardPaths::MoviesLocation) + "/" + QCoreApplication::applicationName();
+        QDir dir;
+        dir.mkpath(m_directory);
+    }
 
     return nextMediaFileName(videoBase, videoExtension);
 }