implement copy to custom location

saeugetier · saeugetier · commit 85e61ce4cae8 · 2025-08-12T22:15:49.000+02:00
diff --git a/qml/FileCopyProgress.qml b/qml/FileCopyProgress.qml
@@ -5,6 +5,7 @@ FileCopyProgressForm {
     standardButtons: Dialog.Cancel
     id: copyFileDialog
     closePolicy: Popup.CloseOnEscape
+    property string targetPath : ""
 
     Connections
     {
@@ -20,7 +21,7 @@ FileCopyProgressForm {
 
     onOpened:
     {
-        filesystem.startCopyFilesToRemovableDrive()
+        filesystem.startCopyFilesToPath(targetPath)
     }
 
     function updateProgress(progress)
@@ -33,9 +34,4 @@ FileCopyProgressForm {
         console.log("Cancel copy")
         filesystem.abortCopy()
     }
-
-    onClosed:
-    {
-        filesystem.unmountRemoveableDrive()
-    }
 }
diff --git a/qml/SettingsMenu.qml b/qml/SettingsMenu.qml
@@ -115,13 +115,35 @@ SettingsMenuForm {
         }
     }
 
+    CustomFolderDialog
+    {
+        id: pictureCopyFolderDialog
+        title: qsTr("Select Copy Pictures Folder")
+        anchors.centerIn: parent
+        width: parent.width - 100
+        height: parent.height - 100
+
+        onAccepted: function()
+        {
+            console.log("Selected copy folder: " + pictureCopyFolderDialog.currentFolder)
+            copyProgressPopup.targetPath = pictureCopyFolderDialog.currentFolder
+            copyProgressPopup.open()
+        }
+    }
+
     buttonSelectPhotoDirectory.onClicked:
     {
         pictureFolderDialog.currentFolder = applicationSettings.foldername
         console.log("selecting pictures folder: " + pictureFolderDialog.currentFolder)
         pictureFolderDialog.open()
     }
 
+    buttonCopyPhotosCustomLocation.onClicked:
+    {
+        pictureCopyFolderDialog.currentFolder = StandardPaths.writableLocation(StandardPaths.HomeLocation)
+        pictureCopyFolderDialog.open()
+    }
+
     buttonClose.onClicked:
     {
         exitSettings()
@@ -139,6 +161,7 @@ SettingsMenuForm {
 
     buttonCopyPhotos.onClicked:
     {
+        copyProgressPopup.targetPath = filesystem.getRemovableDrivePath()
         copyProgressPopup.open()
     }
 
diff --git a/qml/SettingsMenuForm.ui.qml b/qml/SettingsMenuForm.ui.qml
@@ -21,6 +21,7 @@ Item {
     property alias switchPrinter: switchPrinter
     property alias switchPrintFromGallery: switchPrintFromGallery
     property alias buttonCopyPhotos: buttonCopyPhotos
+    property alias buttonCopyPhotosCustomLocation: buttonCopyPhotosCustomLocation
     property alias switchMirrorCamera: switchMirrorCamera
     property alias comboBoxPrinter: comboBoxPrinter
     property alias comboBoxCamera: comboBoxCamera
@@ -117,6 +118,16 @@ Item {
                         text: qsTr("Copy photos to removable disk")
                     }
 
+                    Button {
+                        id: buttonCopyPhotosCustomLocation
+                        text: qsTr("Copy photos to custom location")
+                    }
+
+                    ToolSeparator {
+                        Layout.fillWidth: true
+                        orientation: Qt.Horizontal
+                    }
+
                     DelayButton {
                         id: buttonDeletePhotos
                         text: qsTr("Delete all photos")
diff --git a/src/filesystem.cpp b/src/filesystem.cpp
@@ -144,14 +144,23 @@ void FileSystem::unmountRemoveableDrive()
     unmountProcess.waitForFinished();
 }
 
-void FileSystem::startCopyFilesToRemovableDrive()
+void FileSystem::startCopyFilesToPath(const QString &path)
 {
     QString imagePath = this->getImagePath();
     imagePath = imagePath.right(imagePath.length() - QString("file://").length());
-    QString removableDrivePath = this->getRemovableDrivePath();
-    qDebug() << "Try to copy all images to removable drive";
 
-    if(removableDrivePath.length())
+    QString copyPath;
+    if (path.startsWith("file://", Qt::CaseInsensitive))
+    {
+        QUrl url(path);
+        copyPath = QUrl(path).toLocalFile();
+    }
+    else
+    {
+        copyPath = path;
+    }
+
+    if(copyPath.length())
     {
         QDir imageDir(imagePath);
         QStringList filters;
@@ -161,7 +170,7 @@ void FileSystem::startCopyFilesToRemovableDrive()
         if(!imageDir.isEmpty() && imageDir.exists())
         {
             qDebug() << "Image folder not empty and found removable disc. Copying...";
-            m_copyFuture = QtConcurrent::run([removableDrivePath,imagePath, this]() {
+            m_copyFuture = QtConcurrent::run([copyPath,imagePath, this]() {
                 QDir imageDir(imagePath);
                 QStringList filters;
                 filters << "*.jpg" << "*.JPG";
@@ -174,13 +183,13 @@ void FileSystem::startCopyFilesToRemovableDrive()
                 for(i = 0; i < files.count() && !this->m_copyFuture.isCanceled(); i++)
                 {
                     int progress = (100 * i + 1) / files.count();
-                    qDebug() << "Copy file: " << imagePath + "/" + files[i] << " to: " << removableDrivePath + "/" + files[i] << " Progress: " << progress;
-                    if(QFile::exists(removableDrivePath + "/" + files[i]))
-                        QFile::remove(removableDrivePath + "/" + files[i]);
+                    qDebug() << "Copy file: " << imagePath + "/" + files[i] << " to: " << copyPath + "/" + files[i] << " Progress: " << progress;
+                    if(QFile::exists(copyPath + "/" + files[i]))
+                        QFile::remove(copyPath + "/" + files[i]);
 
-                    if(!QFile::copy(imagePath + "/" + files[i], removableDrivePath + "/" + files[i]))
+                    if(!QFile::copy(imagePath + "/" + files[i], copyPath + "/" + files[i]))
                     {
-                        if(!QFile::copy(imagePath + "/collage/" + files[i], removableDrivePath + "/" + files[i]))
+                        if(!QFile::copy(imagePath + "/collage/" + files[i], copyPath + "/" + files[i]))
                         {
                             qDebug() << "Copying file: " << files[i] << " was not successfull";
                         }
@@ -211,7 +220,7 @@ void FileSystem::startCopyFilesToRemovableDrive()
 QString FileSystem::getRemovableDrivePath()
 {
     static QRegularExpression regexDrive("\\/dev\\/sd*");
-    static QRegularExpression regexBoot("\\/boot");
+    static QRegularExpression regexBoot("^/(boot|home|tmp)?$");
     QList<QStorageInfo> drives = QStorageInfo::mountedVolumes();
     for(int i = 0; i < drives.count(); i++)
     {
diff --git a/src/filesystem.h b/src/filesystem.h
@@ -16,14 +16,14 @@ class FileSystem : public QObject
     Q_INVOKABLE void checkImageFolders();
     Q_INVOKABLE bool removableDriveMounted();
     Q_INVOKABLE void unmountRemoveableDrive();
-    Q_INVOKABLE void startCopyFilesToRemovableDrive();
+    Q_INVOKABLE void startCopyFilesToPath(const QString &path);
     Q_INVOKABLE void abortCopy();
     Q_INVOKABLE void deleteAllImages();
     Q_INVOKABLE bool layoutFilesOnRemovableDrive();
     Q_INVOKABLE void copyLayoutFiles();
     Q_INVOKABLE QSize getImageSize(QString filename);
+    Q_INVOKABLE QString getRemovableDrivePath();
 protected:
-    QString getRemovableDrivePath();
     QFuture<void> m_copyFuture;
 signals:
     void copyProgress(int progress);

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ FileCopyProgressForm {`
`5`	`5`	`standardButtons: Dialog.Cancel`
`6`	`6`	`id: copyFileDialog`
`7`	`7`	`closePolicy: Popup.CloseOnEscape`
	`8`	`+ property string targetPath : ""`
`8`	`9`
`9`	`10`	`Connections`
`10`	`11`	`{`
`@@ -20,7 +21,7 @@ FileCopyProgressForm {`
`20`	`21`
`21`	`22`	`onOpened:`
`22`	`23`	`{`
`23`		`- filesystem.startCopyFilesToRemovableDrive()`
	`24`	`+ filesystem.startCopyFilesToPath(targetPath)`
`24`	`25`	`}`
`25`	`26`
`26`	`27`	`function updateProgress(progress)`
`@@ -33,9 +34,4 @@ FileCopyProgressForm {`
`33`	`34`	`console.log("Cancel copy")`
`34`	`35`	`filesystem.abortCopy()`
`35`	`36`	`}`
`36`		`-`
`37`		`- onClosed:`
`38`		`- {`
`39`		`- filesystem.unmountRemoveableDrive()`
`40`		`- }`
`41`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,13 +115,35 @@ SettingsMenuForm {`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
	`118`	`+ CustomFolderDialog`
	`119`	`+ {`
	`120`	`+ id: pictureCopyFolderDialog`
	`121`	`+ title: qsTr("Select Copy Pictures Folder")`
	`122`	`+ anchors.centerIn: parent`
	`123`	`+ width: parent.width - 100`
	`124`	`+ height: parent.height - 100`
	`125`	`+`
	`126`	`+ onAccepted: function()`
	`127`	`+ {`
	`128`	`+ console.log("Selected copy folder: " + pictureCopyFolderDialog.currentFolder)`
	`129`	`+ copyProgressPopup.targetPath = pictureCopyFolderDialog.currentFolder`
	`130`	`+ copyProgressPopup.open()`
	`131`	`+ }`
	`132`	`+ }`
	`133`	`+`
`118`	`134`	`buttonSelectPhotoDirectory.onClicked:`
`119`	`135`	`{`
`120`	`136`	`pictureFolderDialog.currentFolder = applicationSettings.foldername`
`121`	`137`	`console.log("selecting pictures folder: " + pictureFolderDialog.currentFolder)`
`122`	`138`	`pictureFolderDialog.open()`
`123`	`139`	`}`
`124`	`140`
	`141`	`+ buttonCopyPhotosCustomLocation.onClicked:`
	`142`	`+ {`
	`143`	`+ pictureCopyFolderDialog.currentFolder = StandardPaths.writableLocation(StandardPaths.HomeLocation)`
	`144`	`+ pictureCopyFolderDialog.open()`
	`145`	`+ }`
	`146`	`+`
`125`	`147`	`buttonClose.onClicked:`
`126`	`148`	`{`
`127`	`149`	`exitSettings()`
`@@ -139,6 +161,7 @@ SettingsMenuForm {`
`139`	`161`
`140`	`162`	`buttonCopyPhotos.onClicked:`
`141`	`163`	`{`
	`164`	`+ copyProgressPopup.targetPath = filesystem.getRemovableDrivePath()`
`142`	`165`	`copyProgressPopup.open()`
`143`	`166`	`}`
`144`	`167`