Modified the file prefix for windows

Author: gabriel-bolbotina

app/inpututils.cpp

@@ -70,6 +70,11 @@
 
 static const QString DATE_TIME_FORMAT = QStringLiteral( "yyMMdd-hhmmss" );
 static const QString INVALID_DATETIME_STR = QStringLiteral( "Invalid datetime" );
+#ifdef Q_OS_WIN32
+static const QString FILE_PATH_PREFIX = QStringLiteral( "file:///" );
+#else
+static const QString FILE_PATH_PREFIX = QStringLiteral( "file://" );
+#endif
 
 InputUtils::InputUtils( QObject *parent )
   : QObject( parent )
@@ -91,9 +96,9 @@ bool InputUtils::removeFile( const QString &filePath )
 bool InputUtils::copyFile( const QString &srcPath, const QString &dstPath )
 {
   QString modSrcPath = srcPath;
-  if ( srcPath.startsWith( "file://" ) )
+  if ( srcPath.startsWith( FILE_PATH_PREFIX ) )
   {
-    modSrcPath = modSrcPath.replace( "file://", "" );
+    modSrcPath = modSrcPath.replace( FILE_PATH_PREFIX, "" );
   }
 
   QFileInfo fi( dstPath );
@@ -1044,11 +1049,10 @@ QString InputUtils::resolvePath( const QString &path, const QString &homePath, c
 QString InputUtils::getRelativePath( const QString &path, const QString &prefixPath )
 {
   QString modPath = path;
-  QString filePrefix( "file://" );
 
-  if ( path.startsWith( filePrefix ) )
+  if ( path.startsWith( FILE_PATH_PREFIX ) )
   {
-    modPath = modPath.replace( filePrefix, QString() );
+    modPath = modPath.replace( FILE_PATH_PREFIX, QString() );
   }
 
   if ( prefixPath.isEmpty() ) return modPath;
@@ -1983,7 +1987,7 @@ void InputUtils::sanitizeFileName( QString &fileName )
 
 void InputUtils::sanitizePath( QString &path )
 {
-  const bool pathStartsWithFileURL = path.startsWith( "file://" );
+  const bool pathStartsWithFileURL = path.startsWith( FILE_PATH_PREFIX );
 
   if ( pathStartsWithFileURL )
   {
@@ -2018,9 +2022,8 @@ void InputUtils::sanitizePath( QString &path )
   if ( pathStartsWithFileURL )
   {
     // restore file:// prefix
-    sanitizedPath = "file://" + sanitizedPath;
+    sanitizedPath = FILE_PATH_PREFIX + sanitizedPath;
   }
-
   path = sanitizedPath;
 }
 

app/inpututils.h

@@ -367,7 +367,7 @@ class InputUtils: public QObject
 
     /**
      * Returns relative path of the file to given prefixPath. If prefixPath does not match a path parameter,
-     * returns an empty string. If a path starts with "file://", this prefix is ignored.
+     * returns an empty string. If a path starts with "file://" or "file:///" (only on Windows), this prefix is ignored.
      * \param path Absolute path to file
      * \param prefixPath
      */

app/qml/form/editors/MMFormGalleryEditor.qml

@@ -57,7 +57,7 @@ MMPrivateComponents.MMBaseInput {
         let absolutePath = model.PhotoPath
 
         if ( absolutePath !== '' && __inputUtils.fileExists( absolutePath ) ) {
-          return "file://" + absolutePath
+          return Qt.os.platform === "windows" ? "file:///" + absolutePath : "file://" + absolutePath
         }
         return ''
       }

app/qml/form/editors/MMFormPhotoEditor.qml

@@ -173,10 +173,10 @@ MMFormPhotoViewer {
     target: root.sketchingController
 
     function onTempPhotoSourceChanged( newPath ){
-      if ( internal.tempSketchedImageSource === "file://" + newPath ) {
+      if ( internal.tempSketchedImageSource === getPhotoUrlPrefix() + newPath ) {
         internal.tempSketchedImageSource = ""
       }
-      internal.tempSketchedImageSource = "file://" + newPath
+      internal.tempSketchedImageSource = getPhotoUrlPrefix() + newPath
     }
 
     function onSketchesSavingError(){
@@ -269,7 +269,7 @@ MMFormPhotoViewer {
 
       if ( __inputUtils.fileExists( absolutePath ) ) {
         root.photoState = "valid"
-        resolvedImageSource = "file://" + absolutePath
+        resolvedImageSource = getPhotoUrlPrefix() + absolutePath
         tempSketchedImageSource = ""
       }
       else if ( __inputUtils.isValidUrl( absolutePath ) ) {
@@ -402,5 +402,11 @@ MMFormPhotoViewer {
         }
       }
     }
+
+    // Function that returns the photo URL path prefix, based on the platform
+    function getPhotoUrlPrefix()
+    {
+      return Qt.platform.os === "windows" ? "file:///" : "file://"
+    }
   }
 }

app/qml/form/editors/MMFormPhotoViewer.qml

@@ -75,7 +75,7 @@ MMPrivateComponents.MMBaseInput {
       visible: photoStateGroup.state !== "notSet"
 
       photoUrl: root.photoUrl
-      isLocalFile: root.photoUrl.startsWith( "file://" )
+      isLocalFile: isPhotoUrlStartingWithPrefix()
       cache: false
 
       fillMode: Image.PreserveAspectCrop
@@ -125,7 +125,7 @@ MMPrivateComponents.MMBaseInput {
         iconSource: __style.drawIcon
         iconColor: __style.forestColor
 
-        visible: root.editState === "enabled" && photoStateGroup.state !== "notSet" && __activeProject.photoSketchingEnabled && root.photoUrl.startsWith("file://")
+        visible: root.editState === "enabled" && photoStateGroup.state !== "notSet" && __activeProject.photoSketchingEnabled && isPhotoUrlStartingWithPrefix()
 
         onClicked: {
           sketchingLoader.active = true
@@ -185,4 +185,10 @@ MMPrivateComponents.MMBaseInput {
       }
     }
   }
+
+  // Function that returns boolean value if the photo URL path starts with a prefix, based on the platform
+  function isPhotoUrlStartingWithPrefix(){
+    let filePrefix = Qt.platform.os === "windows" ? "file:///" : "file://"
+    return root.photoUrl.startsWith( filePrefix )
+  }
 }

app/test/testsketching.cpp

@@ -169,7 +169,11 @@ void TestSketching::testLoadBackupSketch()
   sketchingController.mPhotoSource = path;
   sketchingController.mProjectName = QStringLiteral( "/this/is/long/path/to/image/test_sketching" );
   sketchingController.prepareController();
+#ifdef Q_OS_WIN32
+  QCOMPARE( sketchingController.mPhotoSource, "file:///" + QDir::tempPath() + QStringLiteral( "/test_sketching" ) + QStringLiteral( "/MM_test_image.jpg" ) );
+#else
   QCOMPARE( sketchingController.mPhotoSource, "file://" + QDir::tempPath() + QStringLiteral( "/test_sketching" ) + QStringLiteral( "/MM_test_image.jpg" ) );
+#endif
   QCOMPARE( sketchingController.mOriginalPhotoSource, QUrl( path ).toLocalFile() );
   QCOMPARE( spy.count(), 1 );
   auto signalArgs = spy.takeLast();

app/test/testutilsfunctions.cpp

@@ -274,7 +274,11 @@ void TestUtilsFunctions::getRelativePath()
   QString relativePath2 =  mUtils->getRelativePath( path2, prefixPath );
   QCOMPARE( fileName2, relativePath2 );
 
+#ifdef Q_OS_WIN32
+  QString path3 = QStringLiteral( "file:///" ) + path2;
+#else
   QString path3 = QStringLiteral( "file://" ) + path2;
+#endif
   QString relativePath3 =  mUtils->getRelativePath( path3, prefixPath );
   QCOMPARE( fileName2, relativePath3 );