From 594fcba67600704bee9115c86e18927b2237b304 Mon Sep 17 00:00:00 2001
From: Thomas Preud'homme <robotux@celest.fr>
Date: Tue, 29 May 2018 05:44:34 +0100
Subject: New upstream version 1.4.0.8

---
 plugins/CopyEngine/Ultracopier/ListThread.cpp | 29 +++++++++++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

(limited to 'plugins/CopyEngine/Ultracopier/ListThread.cpp')

diff --git a/plugins/CopyEngine/Ultracopier/ListThread.cpp b/plugins/CopyEngine/Ultracopier/ListThread.cpp
index 8d47326..970536a 100644
--- a/plugins/CopyEngine/Ultracopier/ListThread.cpp
+++ b/plugins/CopyEngine/Ultracopier/ListThread.cpp
@@ -1,6 +1,7 @@
 #include "ListThread.h"
 #include <QStorageInfo>
 #include <QMutexLocker>
+#include <QtGlobal>
 #include "../../../cpp11addition.h"
 
 ListThread::ListThread(FacilityInterface * facilityInterface)
@@ -483,9 +484,33 @@ bool ListThread::newCopy(const std::vector<std::string> &sources,const std::stri
         ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Warning,"unable to get new thread");
         return false;
     }
-    scanFileOrFolderThread->addToList(sources,destination);
+    std::regex base_regex("^[a-z][a-z][a-z]*:/.*");
+    std::smatch base_match;
+    std::vector<std::string> sourcesClean;
+    unsigned int index=0;
+    while(index<sources.size())
+    {
+        std::string source=sources.at(index);
+        #ifndef Q_OS_WIN
+        if(stringStartWith(source,"file:///"))
+            source.replace(0,7,"");
+        #else
+        if(stringStartWith(source,"file:///"))
+            source.replace(0,8,"");
+        else if(stringStartWith(source,"file://"))
+            source.replace(0,7,"");
+        else if(stringStartWith(source,"file:/"))
+            source.replace(0,6,"");
+        #endif
+        else if (std::regex_match(source, base_match, base_regex))
+            return false;
+        index++;
+        sourcesClean.push_back(source);
+    }
+    ULTRACOPIER_DEBUGCONSOLE(Ultracopier::DebugLevel_Notice,"sourcesClean: "+stringimplode(sourcesClean,";"));
+    scanFileOrFolderThread->addToList(sourcesClean,destination);
     scanThreadHaveFinish(true);
-    detectDrivesOfCurrentTransfer(sources,destination);
+    detectDrivesOfCurrentTransfer(sourcesClean,destination);
     return true;
 }
 
-- 
cgit v1.2.3