Temporary .qgs files are deleted

pblottiere · pblottiere · commit 1d8574e436f7 · 2017-07-31T11:09:14.000+01:00
diff --git a/python/core/qgsarchive.sip b/python/core/qgsarchive.sip
@@ -136,6 +136,13 @@ class QgsProjectArchive : QgsArchive
  Returns the current .qgs project file or an empty string if there's none
  :rtype: str
 %End
+
+    bool clearProjectFile();
+%Docstring
+ Remove the current .qgs project file from the temporary directory.
+ :return: true if the file is well removed, false otherwise
+ :rtype: bool
+%End
 };
 
 /************************************************************************
diff --git a/src/core/qgsarchive.cpp b/src/core/qgsarchive.cpp
@@ -152,3 +152,17 @@ bool QgsProjectArchive::unzip( const QString &filename )
   else
     return false;
 }
+
+bool QgsProjectArchive::clearProjectFile()
+{
+  bool rc = false;
+  QString file = projectFile();
+
+  if ( !file.isEmpty() && QFile::exists( file ) )
+    rc = QFile::remove( file );
+
+  if ( rc )
+    mFiles.removeOne( file );
+
+  return rc;
+}
diff --git a/src/core/qgsarchive.h b/src/core/qgsarchive.h
@@ -147,6 +147,12 @@ class  CORE_EXPORT QgsProjectArchive : public QgsArchive
      * Returns the current .qgs project file or an empty string if there's none
      */
     QString projectFile() const;
+
+    /**
+     * Remove the current .qgs project file from the temporary directory.
+     * \returns true if the file is well removed, false otherwise
+     */
+    bool clearProjectFile();
 };
 
 #endif
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
@@ -2110,17 +2110,18 @@ bool QgsProject::unzip( const QString &filename )
     return false;
   }
 
-  // keep the archive
+  // keep the archive and remove the temporary .qgs file
   mUnzipping = false;
   mPathResolverBaseName = QString();
   mArchive.reset( archive.release() );
+  mArchive->clearProjectFile();
 
   return true;
 }
 
 bool QgsProject::zip()
 {
-  if ( unzipped() )
+  if ( !mArchive->filename().isEmpty() )
     return zip( mArchive->filename() );
 
   return false;
@@ -2168,9 +2169,6 @@ bool QgsProject::zip( const QString &filename )
     return false;
   }
 
-  // keep the archive
-  mArchive.reset( archive.release() );
-
   return true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2110,17 +2110,18 @@ bool QgsProject::unzip( const QString &filename )`
`2110`	`2110`	`return false;`
`2111`	`2111`	`}`
`2112`	`2112`
`2113`		`- // keep the archive`
	`2113`	`+ // keep the archive and remove the temporary .qgs file`
`2114`	`2114`	`mUnzipping = false;`
`2115`	`2115`	`mPathResolverBaseName = QString();`
`2116`	`2116`	`mArchive.reset( archive.release() );`
	`2117`	`+ mArchive->clearProjectFile();`
`2117`	`2118`
`2118`	`2119`	`return true;`
`2119`	`2120`	`}`
`2120`	`2121`
`2121`	`2122`	`bool QgsProject::zip()`
`2122`	`2123`	`{`
`2123`		`- if ( unzipped() )`
	`2124`	`+ if ( !mArchive->filename().isEmpty() )`
`2124`	`2125`	`return zip( mArchive->filename() );`
`2125`	`2126`
`2126`	`2127`	`return false;`
`@@ -2168,9 +2169,6 @@ bool QgsProject::zip( const QString &filename )`
`2168`	`2169`	`return false;`
`2169`	`2170`	`}`
`2170`	`2171`
`2171`		`- // keep the archive`
`2172`		`- mArchive.reset( archive.release() );`
`2173`		`-`
`2174`	`2172`	`return true;`
`2175`	`2173`	`}`
`2176`	`2174`