Improve error message when trying to render and file is not writable:

http://kdenlive.org/mantis/view.php?id=1990

svn path=/trunk/kdenlive/; revision=5366

diff --git a/renderer/renderjob.cpp b/renderer/renderjob.cpp
index 779f0fbc8299c5f45d187a531e6b525e838bfaa0..8f705bcf8262209e4a4c17c1f52a241c9b63cccf 100644 (file)
--- a/renderer/renderjob.cpp
+++ b/renderer/renderjob.cpp
@@ -40,12 +40,12 @@ public:
 
 static QDBusConnection connection(QLatin1String(""));
 
-RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, const QString &profile, const QString &rendermodule, const QString &player, const QString &scenelist, const QString &dest, const QStringList &preargs, const QStringList &args, int in, int out) :
-        QObject(),
-        m_jobUiserver(NULL),
-        m_kdenliveinterface(NULL),
-        m_usekuiserver(usekuiserver),
-        m_enablelog(false)
+RenderJob::RenderJob(bool erase, bool usekuiserver, const QString& renderer, const QString& profile, const QString& rendermodule, const QString& player, const QString& scenelist, const QString& dest, const QStringList& preargs, const QStringList& args, int in, int out) :
+    QObject(),
+    m_jobUiserver(NULL),
+    m_kdenliveinterface(NULL),
+    m_usekuiserver(usekuiserver),
+    m_enablelog(false)
 {
     m_scenelist = scenelist;
     m_dest = dest;
@@ -53,7 +53,7 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, con
     m_progress = 0;
     m_erase = erase;
     m_renderProcess = new QProcess;
-
+    
     // Disable VDPAU so that rendering will work even if there is a Kdenlive instance using VDPAU
 #if QT_VERSION >= 0x040600
     QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
@@ -82,7 +82,6 @@ RenderJob::RenderJob(bool erase, bool usekuiserver, const QString &renderer, con
     if (args.contains("pass=1")) m_dualpass = true;
 
     connect(m_renderProcess, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(slotCheckProcess(QProcess::ProcessState)));
-    //connect(m_renderProcess, SIGNAL(finished(int, QProcess::ExitStatus)), this, SLOT(slotIsOver(int, QProcess::ExitStatus)));
     m_renderProcess->setReadChannel(QProcess::StandardError);
 
     m_enablelog = (getenv("KDENLIVE_RENDER_LOG") != NULL);
@@ -230,6 +229,13 @@ void RenderJob::start()
     }
 
     initKdenliveDbusInterface();
+    
+    // Make sure the destination file is writable
+    QFile checkDestination(m_dest);
+    if (!checkDestination.open(QIODevice::WriteOnly)) {
+        slotIsOver(QProcess::NormalExit, false);
+    }
+    checkDestination.close();
 
     // Because of the logging, we connect to stderr in all cases.
     connect(m_renderProcess, SIGNAL(readyReadStandardError()), this, SLOT(receivedStderr()));
@@ -243,9 +249,9 @@ void RenderJob::initKdenliveDbusInterface()
 {
     QString kdenliveId;
     QDBusConnection connection = QDBusConnection::sessionBus();
-    QDBusConnectionInterface *ibus = connection.interface();
+    QDBusConnectionInterface* ibus = connection.interface();
     const QStringList services = ibus->registeredServiceNames();
-    foreach(const QString &service, services) {
+    foreach(const QString & service, services) {
         if (!service.startsWith("org.kde.kdenlive"))
             continue;
         kdenliveId = service;
@@ -263,7 +269,7 @@ void RenderJob::initKdenliveDbusInterface()
         m_dbusargs.append(m_dest);
         m_dbusargs.append((int) 0);
         m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingProgress", m_dbusargs);
-        connect(m_kdenliveinterface, SIGNAL(abortRenderJob(const QString &)),
+        connect(m_kdenliveinterface, SIGNAL(abortRenderJob(const QString&)),
                 this, SLOT(slotAbort(const QString&)));
     }
 }
@@ -276,9 +282,23 @@ void RenderJob::slotCheckProcess(QProcess::ProcessState state)
 
 
 
-void RenderJob::slotIsOver(QProcess::ExitStatus status)
+void RenderJob::slotIsOver(QProcess::ExitStatus status, bool isWritable)
 {
     if (m_jobUiserver) m_jobUiserver->call("terminate", QString());
+    if (!isWritable) {
+        QString error = tr("Cannot write to %1, check the permissions.").arg(m_dest);
+        if (m_kdenliveinterface) {
+            m_dbusargs[1] = (int) - 2;
+            m_dbusargs.append(error);
+            m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs);
+        }
+        QStringList args;
+        args << "--error" << error;
+        if (m_enablelog) m_logstream << error << endl;
+        qDebug() << error;
+        QProcess::startDetached("kdialog", args);
+        qApp->quit();
+    }
     if (m_erase) {
         QFile f(m_scenelist);
         f.remove();
@@ -291,9 +311,10 @@ void RenderJob::slotIsOver(QProcess::ExitStatus status)
             m_kdenliveinterface->callWithArgumentList(QDBus::NoBlock, "setRenderingFinished", m_dbusargs);
         }
         QStringList args;
-        args << "--error" << tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest);
-        if (m_enablelog) m_logstream << "Rendering of " << m_dest << " aborted, resulting video will probably be corrupted." << endl;
-        qDebug() << "Rendering of " << m_dest << " aborted, resulting video will probably be corrupted.";
+        QString error = tr("Rendering of %1 aborted, resulting video will probably be corrupted.").arg(m_dest);
+        args << "--error" << error;
+        if (m_enablelog) m_logstream << error << endl;
+        qDebug() << error;
         QProcess::startDetached("kdialog", args);
         qApp->quit();
     } else {

diff --git a/renderer/renderjob.h b/renderer/renderjob.h
index f3b4e35d7f1e4312bebe90c0233d46b2ed16d422..346ab94e2e34f5e276e08ecef2b2d4b5c2aa2059 100644 (file)
--- a/renderer/renderjob.h
+++ b/renderer/renderjob.h
@@ -34,14 +34,14 @@ class RenderJob : public QObject
     Q_OBJECT
 
 public:
-    RenderJob(bool erase, bool usekuiserver, const QString &renderer, const QString &profile, const QString &rendermodule, const QString &player, const QString &scenelist, const QString &dest, const QStringList &preargs, const QStringList &args, int in = -1, int out = -1);
+    RenderJob(bool erase, bool usekuiserver, const QString& renderer, const QString& profile, const QString& rendermodule, const QString& player, const QString& scenelist, const QString& dest, const QStringList& preargs, const QStringList& args, int in = -1, int out = -1);
     ~RenderJob();
 
 public slots:
     void start();
 
 private slots:
-    void slotIsOver(QProcess::ExitStatus status);
+    void slotIsOver(QProcess::ExitStatus status, bool isWritable = true);
     void receivedStderr();
     void slotAbort();
     void slotAbort(const QString& url);
@@ -51,15 +51,15 @@ private:
     QString m_scenelist;
     QString m_dest;
     int m_progress;
-    QProcess *m_renderProcess;
+    QProcess* m_renderProcess;
     QString m_errorMessage;
     QString m_prog;
     QString m_player;
     QStringList m_args;
     bool m_erase;
     bool m_dualpass;
-    QDBusInterface *m_jobUiserver;
-    QDBusInterface *m_kdenliveinterface;
+    QDBusInterface* m_jobUiserver;
+    QDBusInterface* m_kdenliveinterface;
     QList<QVariant> m_dbusargs;
     QTime m_startTime;
     void initKdenliveDbusInterface();