dawy_go/vnote
1
0
Fork 0
mirror of https://gitee.com/vnotex/vnote.git synced 2025-07-05 22:09:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

FileList: bug fix when importing the same note file in the same folder

Browse Source
This commit is contained in:
Le Tan 2018-06-08 20:00:20 +08:00
parent 88d719bb28
commit feea50d888
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/vfile.cpp
View File

@ -44,7 +44,10 @@ bool VFile::open()
Q_ASSERT(m_content.isEmpty()); Q_ASSERT(m_content.isEmpty());
QString filePath = fetchPath(); QString filePath = fetchPath();
Q_ASSERT(QFileInfo::exists(filePath)); if (!QFileInfo::exists(filePath)) {
return false;
}
m_content = VUtils::readFileFromDisk(filePath); m_content = VUtils::readFileFromDisk(filePath);
m_lastModified = QFileInfo(filePath).lastModified(); m_lastModified = QFileInfo(filePath).lastModified();
m_opened = true; m_opened = true;

10
src/vfilelist.cpp
View File

@ -771,6 +771,16 @@ bool VFileList::importFiles(const QStringList &p_files, QString *p_errMsg)
bool copyNeeded = true; bool copyNeeded = true;
if (VUtils::equalPath(dirPath, fi.absolutePath())) { if (VUtils::equalPath(dirPath, fi.absolutePath())) {
// Check if it is already a note.
if (m_directory->findFile(name, false)) {
VUtils::addErrMsg(p_errMsg, tr("Skip importing file %1. "
"A note with the same name (case-insensitive) "
"in the same directory already exists.")
.arg(file));
ret = false;
continue;
}
qDebug() << "skip cpoy file" << file << "locates in" << dirPath; qDebug() << "skip cpoy file" << file << "locates in" << dirPath;
copyNeeded = false; copyNeeded = false;
} }