Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check that the backup folder is not inside the project path to be backed up

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-05-27 01:04:10 +02:00
parent 25981edf1a
commit f1e717e6a1
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/core/project.py
+15 -6
View File
@@ -526,25 +526,25 @@ class NWProject():
self.theParent.makeAlert(( self.theParent.makeAlert((
"Cannot backup project because no backup path is set. " "Cannot backup project because no backup path is set. "
"Please set a valid backup location in Tools > Preferences." "Please set a valid backup location in Tools > Preferences."
), nwAlert.WARN) ), nwAlert.ERROR)
return False return False
if self.projName is None or self.projName == "": if self.projName is None or self.projName == "":
self.theParent.makeAlert(( self.theParent.makeAlert((
"Cannot backup project because no project name is set. " "Cannot backup project because no project name is set. "
"Please set a Working Title in Project > Project Settings." "Please set a Working Title in Project > Project Settings."
), nwAlert.WARN) ), nwAlert.ERROR)
return False return False
if not path.isdir(self.mainConf.backupPath): if not path.isdir(self.mainConf.backupPath):
self.theParent.makeAlert(( self.theParent.makeAlert((
"Cannot backup project because the backup path does not exist. " "Cannot backup project because the backup path does not exist. "
"Please set a valid backup location in Tools > Preferences." "Please set a valid backup location in Tools > Preferences."
), nwAlert.WARN) ), nwAlert.ERROR)
return False return False
cleanName = self.getFileSafeProjectName() cleanName = self.getFileSafeProjectName()
baseDir = path.join(self.mainConf.backupPath, cleanName) baseDir = path.abspath(path.join(self.mainConf.backupPath, cleanName))
if not path.isdir(baseDir): if not path.isdir(baseDir):
try: try:
mkdir(baseDir) mkdir(baseDir)
@@ -556,16 +556,25 @@ class NWProject():
) )
return False return False
backPath = path.abspath(self.projPath)
if path.commonpath([backPath, baseDir]) == backPath:
self.theParent.makeAlert((
"Cannot backup project because the backup path is within the "
"project folder to be backed up. Please choose a different "
"backup path in Tools > Preferences."
), nwAlert.ERROR)
return False
archName = "Backup from %s" % formatTimeStamp(time(), fileSafe=True) archName = "Backup from %s" % formatTimeStamp(time(), fileSafe=True)
baseName = path.join(baseDir, archName) baseName = path.join(baseDir, archName)
try: try:
self._clearLockFile() self._clearLockFile()
make_archive(baseName, "zip", self.projPath, ".") make_archive(baseName, "zip", backPath, ".")
self._writeLockFile() self._writeLockFile()
if doNotify: if doNotify:
self.theParent.makeAlert( self.theParent.makeAlert(
"Backup archive file written to: '%s.zip'" % path.join(cleanName, archName), "Backup archive file written to: %s.zip" % path.join(cleanName, archName),
nwAlert.INFO nwAlert.INFO
) )
else: else: