Adds more explicit error message when auxiliary storage is saved

pblottiere · nyalldawson · commit 1ecc57d2a29f · 2018-10-08T07:24:53.000+10:00
diff --git a/src/core/qgsauxiliarystorage.cpp b/src/core/qgsauxiliarystorage.cpp
@@ -626,15 +626,33 @@ bool QgsAuxiliaryStorage::duplicateTable( const QgsDataSourceUri &ogrUri, const
   return rc;
 }
 
-bool QgsAuxiliaryStorage::saveAs( const QString &filename ) const
+QString QgsAuxiliaryStorage::errorString() const
 {
-  if ( QFile::exists( filename ) )
-    QFile::remove( filename );
+  return mErrorString;
+}
+
+bool QgsAuxiliaryStorage::saveAs( const QString &filename )
+{
+  mErrorString.clear();
+
+  QFile dest( filename );
+  if ( dest.exists() && !dest.remove() )
+  {
+    mErrorString = dest.errorString();
+    return false;
+  }
+
+  QFile origin( currentFileName() );
+  if ( !origin.copy( filename ) )
+  {
+    mErrorString = origin.errorString();
+    return false;
+  }
 
-  return  QFile::copy( currentFileName(), filename );
+  return true;
 }
 
-bool QgsAuxiliaryStorage::saveAs( const QgsProject &project ) const
+bool QgsAuxiliaryStorage::saveAs( const QgsProject &project )
 {
   return saveAs( filenameForProject( project ) );
 }
diff --git a/src/core/qgsauxiliarystorage.h b/src/core/qgsauxiliarystorage.h
@@ -319,12 +319,14 @@ class CORE_EXPORT QgsAuxiliaryStorage
      */
     QString currentFileName() const;
 
+    QString errorString() const;
+
     /**
      * Saves the current database to a new path.
      *
      * \returns true if everything is saved, false otherwise
      */
-    bool saveAs( const QString &filename ) const;
+    bool saveAs( const QString &filename );
 
     /**
      * Saves the current database to a new path for a specific project.
@@ -333,7 +335,7 @@ class CORE_EXPORT QgsAuxiliaryStorage
      *
      * \returns true if everything is saved, false otherwise
      */
-    bool saveAs( const QgsProject &project ) const;
+    bool saveAs( const QgsProject &project );
 
     /**
      * Saves the current database.
@@ -408,6 +410,7 @@ class CORE_EXPORT QgsAuxiliaryStorage
     QString mFileName; // original filename
     QString mTmpFileName; // temporary filename used in copy mode
     bool mCopy = false;
+    QString mErrorString;
 };
 
 #endif
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -1649,7 +1649,10 @@ bool QgsProject::write()
 
     // errors raised during writing project file are more important
     if ( !asOk && writeOk )
-      setError( tr( "Unable to save auxiliary storage" ) );
+    {
+      const QString err = mAuxiliaryStorage->errorString();
+      setError( tr( "Unable to save auxiliary storage ('%1')" ).arg( err ) );
+    }
 
     return asOk && writeOk;
   }
@@ -2614,7 +2617,8 @@ bool QgsProject::zip( const QString &filename )
 
   if ( ! saveAuxiliaryStorage( asFileName ) )
   {
-    setError( tr( "Unable to save auxiliary storage" ) );
+    const QString err = mAuxiliaryStorage->errorString();
+    setError( tr( "Unable to save auxiliary storage ('%1')" ).arg( err ) );
     return false;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1649,7 +1649,10 @@ bool QgsProject::write()`
`1649`	`1649`
`1650`	`1650`	`// errors raised during writing project file are more important`
`1651`	`1651`	`if ( !asOk && writeOk )`
`1652`		`- setError( tr( "Unable to save auxiliary storage" ) );`
	`1652`	`+ {`
	`1653`	`+ const QString err = mAuxiliaryStorage->errorString();`
	`1654`	`+ setError( tr( "Unable to save auxiliary storage ('%1')" ).arg( err ) );`
	`1655`	`+ }`
`1653`	`1656`
`1654`	`1657`	`return asOk && writeOk;`
`1655`	`1658`	`}`
`@@ -2614,7 +2617,8 @@ bool QgsProject::zip( const QString &filename )`
`2614`	`2617`
`2615`	`2618`	`if ( ! saveAuxiliaryStorage( asFileName ) )`
`2616`	`2619`	`{`
`2617`		`- setError( tr( "Unable to save auxiliary storage" ) );`
	`2620`	`+ const QString err = mAuxiliaryStorage->errorString();`
	`2621`	`+ setError( tr( "Unable to save auxiliary storage ('%1')" ).arg( err ) );`
`2618`	`2622`	`return false;`
`2619`	`2623`	`}`
`2620`	`2624`