Fix TIC replace bug
This commit is contained in:
@@ -1879,6 +1879,8 @@ function FTNMessageScanTossModule() {
|
|||||||
localInfo.fileEntry.fileName = paths.basename(finalPath);
|
localInfo.fileEntry.fileName = paths.basename(finalPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
localInfo.newPath = dst;
|
||||||
|
|
||||||
localInfo.fileEntry.persist(isUpdate, err => {
|
localInfo.fileEntry.persist(isUpdate, err => {
|
||||||
return callback(err, localInfo);
|
return callback(err, localInfo);
|
||||||
});
|
});
|
||||||
@@ -1893,6 +1895,12 @@ function FTNMessageScanTossModule() {
|
|||||||
const oldStorageDir = getAreaStorageDirectoryByTag(localInfo.oldStorageTag);
|
const oldStorageDir = getAreaStorageDirectoryByTag(localInfo.oldStorageTag);
|
||||||
const oldPath = paths.join(oldStorageDir, localInfo.oldFileName);
|
const oldPath = paths.join(oldStorageDir, localInfo.oldFileName);
|
||||||
|
|
||||||
|
// if we updated a file in place, don't delete it!
|
||||||
|
if (localInfo.newPath === oldPath) {
|
||||||
|
Log.trace({path : oldPath}, 'TIC file replaced in place. Nothing to remove.');
|
||||||
|
return callback(null, localInfo);
|
||||||
|
}
|
||||||
|
|
||||||
fs.unlink(oldPath, err => {
|
fs.unlink(oldPath, err => {
|
||||||
if(err) {
|
if(err) {
|
||||||
Log.warn( { error : err.message, oldPath : oldPath }, 'Failed removing old physical file during TIC replacement');
|
Log.warn( { error : err.message, oldPath : oldPath }, 'Failed removing old physical file during TIC replacement');
|
||||||
|
|||||||
Reference in New Issue
Block a user