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

Some more path checks. Should be fine now.

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-05-27 16:35:09 +02:00
parent f1e717e6a1
commit 7c78eff5ea
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/config.py
+3 -3
View File
@@ -424,7 +424,7 @@ class Config:
## Backup ## Backup
cnfSec = "Backup" cnfSec = "Backup"
self.backupPath = self._parseLine( self.backupPath = self._parseLine(
cnfParse, cnfSec, "backuppath", self.CNF_STR, self.backupPath cnfParse, cnfSec, "backuppath", self.CNF_STR, self.backupPath
) )
self.backupOnClose = self._parseLine( self.backupOnClose = self._parseLine(
cnfParse, cnfSec, "backuponclose", self.CNF_BOOL, self.backupOnClose cnfParse, cnfSec, "backuponclose", self.CNF_BOOL, self.backupOnClose
@@ -639,7 +639,7 @@ class Config:
if newPath is None: if newPath is None:
return True return True
if not path.isfile(newPath): if not path.isfile(newPath):
logger.error("Config: File not found. Using default config path instead.") logger.error("File not found, using default config path instead")
return False return False
self.confPath = path.dirname(newPath) self.confPath = path.dirname(newPath)
self.confFile = path.basename(newPath) self.confFile = path.basename(newPath)
@@ -649,7 +649,7 @@ class Config:
if newPath is None: if newPath is None:
return True return True
if not path.isdir(newPath): if not path.isdir(newPath):
logger.error("Config: Path not found. Using default data path instead.") logger.error("Path not found, using default data path instead")
return False return False
self.dataPath = path.abspath(newPath) self.dataPath = path.abspath(newPath)
return True return True
nw/core/project.py
+3 -4
View File
@@ -556,8 +556,7 @@ class NWProject():
) )
return False return False
backPath = path.abspath(self.projPath) if path.commonpath([self.projPath, baseDir]) == self.projPath:
if path.commonpath([backPath, baseDir]) == backPath:
self.theParent.makeAlert(( self.theParent.makeAlert((
"Cannot backup project because the backup path is within the " "Cannot backup project because the backup path is within the "
"project folder to be backed up. Please choose a different " "project folder to be backed up. Please choose a different "
@@ -570,7 +569,7 @@ class NWProject():
try: try:
self._clearLockFile() self._clearLockFile()
make_archive(baseName, "zip", backPath, ".") make_archive(baseName, "zip", self.projPath, ".")
self._writeLockFile() self._writeLockFile()
if doNotify: if doNotify:
self.theParent.makeAlert( self.theParent.makeAlert(
@@ -603,7 +602,7 @@ class NWProject():
else: else:
if projPath.startswith("~"): if projPath.startswith("~"):
projPath = path.expanduser(projPath) projPath = path.expanduser(projPath)
self.projPath = projPath self.projPath = path.abspath(projPath)
self.setProjectChanged(True) self.setProjectChanged(True)
return True return True