Warn user when adding a clip from a removable drive, and propose to copy clip to...

diff --git a/src/clipmanager.cpp b/src/clipmanager.cpp
index ed7cbb0f403b6c5f4593b59232e3238718ba2b26..edd2ddfbc2511ad23a97bac8fa316ea2f950c2d3 100644 (file)
--- a/src/clipmanager.cpp
+++ b/src/clipmanager.cpp
@@ -35,12 +35,19 @@
 #include <KFileDialog>
 #include <KApplication>
 #include <kio/netaccess.h>
+#include <kio/jobuidelegate.h>
+
+#include <solid/device.h>
+#include <solid/storageaccess.h>
+#include <solid/storagedrive.h>
+#include <solid/storagevolume.h>
 
 #include <QGraphicsItemGroup>
 #include <QtConcurrentRun>
 
 #include <KFileMetaInfo>
 
+
 ClipManager::ClipManager(KdenliveDoc *doc) :
     QObject(),
     m_audioThumbsQueue(),
@@ -464,15 +471,43 @@ void ClipManager::resetProducersList(const QList <Mlt::Producer *> prods, bool d
     emit checkAllClips(displayRatioChanged, fpsChanged, brokenClips);
 }
 
+void ClipManager::slotAddClip(KIO::Job *job, const KUrl &, const KUrl &dst)
+{
+    KIO::MetaData meta = job->metaData();
+    kDebug()<<"Finished copying: "<<dst<<" / "<<meta.value("group")<<" / "<<meta.value("groupid");
+    slotAddClipList(KUrl::List () << dst, meta.value("group"), meta.value("groupid"), meta.value("comment"));
+}
+
 void ClipManager::slotAddClipList(const KUrl::List urls, const QString &group, const QString &groupId, const QString &comment)
 {
     QUndoCommand *addClips = new QUndoCommand();
+    // Update list of removable volumes
+    //TODO: update only when new volume is plugged / unplugged
+    listRemovableVolumes();
     foreach(const KUrl & file, urls) {
         if (QFile::exists(file.path())) {//KIO::NetAccess::exists(file, KIO::NetAccess::SourceSide, NULL)) {
             if (!getClipByResource(file.path()).empty()) {
                 if (KMessageBox::warningContinueCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br />already exists in project, what do you want to do?", file.path()), i18n("Clip already exists")) == KMessageBox::Cancel)
                     continue;
             }
+            if (isOnRemovableDevice(file)) {
+               int answer = KMessageBox::warningYesNoCancel(kapp->activeWindow(), i18n("Clip <b>%1</b><br /> is on a removable device, will not be available when device is unplugged", file.path()), i18n("File on a Removable Device"), KGuiItem(i18n("Copy file to project folder")), KGuiItem(i18n("Continue")), KStandardGuiItem::cancel(), QString("copyFilesToProjectFolder"));
+               if (answer == KMessageBox::Cancel) continue;
+               else if (answer == KMessageBox::Yes) {
+                   // Copy files to project folder
+                   QString sourcesFolder = m_doc->projectFolder().path(KUrl::AddTrailingSlash) + "clips/";
+                   KIO::NetAccess::mkdir(sourcesFolder, kapp->activeWindow());
+                   //KIO::filesize_t m_requestedSize;
+                   KIO::CopyJob *copyjob = KIO::copy (file, KUrl(sourcesFolder));
+                   //TODO: for some reason, passing metadata does not work...
+                   copyjob->addMetaData("group", group);
+                   copyjob->addMetaData("groupId", groupId);
+                   copyjob->addMetaData("comment", comment);
+                   copyjob->ui()->setWindow(kapp->activeWindow());
+                   connect(copyjob, SIGNAL(copyingDone(KIO::Job *, const KUrl &, const KUrl &, time_t, bool, bool)), this, SLOT(slotAddClip(KIO::Job *, const KUrl &, const KUrl &)));
+                   continue;
+               }
+           }
             kDebug() << "Adding clip: " << file.path();
             QDomDocument doc;
             QDomElement prod = doc.createElement("producer");
@@ -791,3 +826,90 @@ int ClipManager::clipsCount() const
 }
 
 
+void ClipManager::listRemovableVolumes()
+{
+    QList<SolidVolumeInfo> volumes;
+    m_removableVolumes.clear();
+
+    QList<Solid::Device> devices = Solid::Device::listFromType(Solid::DeviceInterface::StorageAccess);
+
+    foreach(const Solid::Device &accessDevice, devices)
+    {
+        // check for StorageAccess
+        if (!accessDevice.is<Solid::StorageAccess>())
+            continue;
+
+        const Solid::StorageAccess *access = accessDevice.as<Solid::StorageAccess>();
+
+        if (!access->isAccessible())
+            continue;
+
+        // check for StorageDrive
+        Solid::Device driveDevice;
+        for (Solid::Device currentDevice = accessDevice; currentDevice.isValid(); currentDevice = currentDevice.parent())
+        {
+            if (currentDevice.is<Solid::StorageDrive>())
+            {
+                driveDevice = currentDevice;
+                break;
+            }
+        }
+        if (!driveDevice.isValid())
+            continue;
+
+        Solid::StorageDrive *drive = driveDevice.as<Solid::StorageDrive>();
+       if (!drive->isRemovable()) continue;
+
+        // check for StorageVolume
+        Solid::Device volumeDevice;
+        for (Solid::Device currentDevice = accessDevice; currentDevice.isValid(); currentDevice = currentDevice.parent())
+        {
+            if (currentDevice.is<Solid::StorageVolume>())
+            {
+                volumeDevice = currentDevice;
+                break;
+            }
+        }
+        if (!volumeDevice.isValid())
+            continue;
+
+        Solid::StorageVolume *volume = volumeDevice.as<Solid::StorageVolume>();
+
+        SolidVolumeInfo info;
+        info.path = access->filePath();
+        info.isMounted = access->isAccessible();
+        if (!info.path.isEmpty() && !info.path.endsWith('/'))
+            info.path += '/';
+        info.uuid = volume->uuid();
+        info.label = volume->label();
+        info.isRemovable = drive->isRemovable();
+        m_removableVolumes << info;
+    }
+}
+
+bool ClipManager::isOnRemovableDevice(const KUrl &url)
+{
+    SolidVolumeInfo volume;
+    QString path = url.path(KUrl::RemoveTrailingSlash);
+    int volumeMatch = 0;
+
+    //FIXME: Network shares! Here we get only the volume of the mount path...
+    // This is probably not really clean. But Solid does not help us.
+    foreach (const SolidVolumeInfo &v, m_removableVolumes)
+    {
+        if (v.isMounted && !v.path.isEmpty() && path.startsWith(v.path))
+        {
+            int length = v.path.length();
+            if (length > volumeMatch)
+            {
+                volumeMatch = v.path.length();
+                volume = v;
+            }
+        }
+    }
+
+    return volumeMatch;
+}
+
+
+

diff --git a/src/clipmanager.h b/src/clipmanager.h
index ce5089278a6a8f91e2d39be969988c137ca945aa..624bb9b5dda1969cfe6164fcb5339193ffe2c57b 100644 (file)
--- a/src/clipmanager.h
+++ b/src/clipmanager.h
@@ -38,6 +38,7 @@
 #include <KDirWatch>
 #include <klocale.h>
 #include <kdeversion.h>
+#include <KIO/CopyJob>
 
 #if KDE_IS_VERSION(4,5,0)
 #include <KImageCache>
@@ -52,6 +53,21 @@ class KdenliveDoc;
 class DocClipBase;
 class AbstractGroupItem;
 
+
+class SolidVolumeInfo
+{
+
+public:
+
+    QString path; // mount path of volume, with trailing slash
+    QString uuid; // UUID as from Solid
+    QString label; // volume label (think of CDs)
+    bool isRemovable; // may be removed
+    bool isMounted;
+
+    bool isNull() const { return path.isNull(); }
+};
+
 namespace Mlt
 {
 class Producer;
@@ -125,6 +141,8 @@ private slots:
     void slotProcessModifiedClips();
     void slotGetThumbs();
     void slotGetAudioThumbs();
+    /** @brief Clip has been copied, add it now. */
+    void slotAddClip(KIO::Job *job, const KUrl &, const KUrl &dst);
 
 private:   // Private attributes
     /** the list of clips in the document */
@@ -157,6 +175,13 @@ private:   // Private attributes
     bool m_abortAudioThumb;
     /** @brief The id of currently processed clip for audio thumbs creation. */
     QString m_processingAudioThumbId;
+    /** @brief The list of removable drives. */
+    QList<SolidVolumeInfo> m_removableVolumes;
+    
+    /** @brief Get a list of drives, to check if we have files on removable media. */
+    void listRemovableVolumes();
+    /** @brief Check if added file is on a removable drive. */
+    bool isOnRemovableDevice(const KUrl &url);
 
 signals:
     void reloadClip(const QString &);