Thanks to visit codestin.com
Credit goes to github.com

Skip to content

QuickAccess: correct VxUrl when accessing or changing files #2639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

QuickAccess: correct VxUrl when accessing or changing files #2639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion src/utils/vxurlutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

#include <core/exception.h>
#include <core/global.h>
#include <core/vnotex.h>
#include <core/notebookmgr.h>

#include "pathutils.h"
#include <QJsonArray>
Expand Down Expand Up @@ -43,13 +45,18 @@ QString VxUrlUtils::getFilePathFromVxURL(const QString &p_vxUrl) {
int colonPos = p_vxUrl.indexOf(':');
if (colonPos != -1) {
filePath = p_vxUrl.mid(colonPos + 1);
filePath = PathUtils::fileName(filePath); // get 'filePath'
return filePath;
}
} // if not 'filePath', return original 'vxUrl'
return p_vxUrl;
}

QString VxUrlUtils::getFileNameFromVxURL(const QString &p_vxUrl) {
QString filePath = VxUrlUtils::getFilePathFromVxURL(p_vxUrl);

return PathUtils::fileName(filePath);
}

QString VxUrlUtils::getSignatureFromFilePath(const QString &p_filePath)
{
QFileInfo fileInfo(p_filePath);
Expand Down Expand Up @@ -107,8 +114,17 @@ QString VxUrlUtils::getFilePathFromSignature(const QString &p_startPath, const Q
// Find the file with the specified signature in all vx.json files under the specified directory
QDirIterator it(p_startPath, {"vx.json"}, QDir::Files | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);

const QString rootPath = VNoteX::getInst().getNotebookMgr().getCurrentNotebook()->getRootFolderAbsolutePath();
const QString recycleBinPath = PathUtils::concatenateFilePath(rootPath, "vx_recycle_bin");

while (it.hasNext()) {
const QString vxPath = it.next();

// skip vx.json in recycle bin
if (vxPath.endsWith("vx_recycle_bin/vx.json") || vxPath.startsWith(recycleBinPath)) {
continue;
}

QFile vxFile(vxPath);
if (!vxFile.open(QIODevice::ReadOnly)) {
continue;
Expand Down
3 changes: 3 additions & 0 deletions src/utils/vxurlutils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ namespace vnotex
// Get signature from vxUrl.
static QString getSignatureFromVxURL(const QString &p_vxUrl);

// Get file name from vxUrl.
static QString getFileNameFromVxURL(const QString &p_vxUrl);

// Get file path from vxUrl.
static QString getFilePathFromVxURL(const QString &p_vxUrl);

Expand Down
Loading