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

github ImageHost: Modify delete function (#1862)

Browse Source
This commit is contained in:
BeyondXinXin 2021-08-30 07:59:36 +08:00 committed by GitHub
parent 8391014b38
commit e4edee269b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/imagehost/githubimagehost.cpp
View File

@ -3,6 +3,8 @@
#include <QDebug> #include <QDebug>
#include <QFileInfo> #include <QFileInfo>
#include <QByteArray> #include <QByteArray>
#include <QJsonArray>
#include <QJsonDocument>
#include <utils/utils.h> #include <utils/utils.h>
#include <utils/webutils.h> #include <utils/webutils.h>
@ -175,15 +177,36 @@ bool GitHubImageHost::remove(const QString &p_url, QString &p_msg)
const auto urlStr = QString("%1/repos/%2/%3/contents/%4").arg(c_apiUrl, m_userName, m_repoName, resourcePath); const auto urlStr = QString("%1/repos/%2/%3/contents/%4").arg(c_apiUrl, m_userName, m_repoName, resourcePath);
// Get the SHA of the resource. // Get the SHA of the resource.
QString sha = "";
auto reply = vte::NetworkAccess::request(QUrl(urlStr), rawHeader); auto reply = vte::NetworkAccess::request(QUrl(urlStr), rawHeader);
if (reply.m_error != QNetworkReply::NoError) { if (reply.m_error == QNetworkReply::NoError) {
p_msg = tr("Failed to fetch information about the resource (%1).").arg(resourcePath);
return false;
}
auto replyObj = Utils::fromJsonString(reply.m_data); auto replyObj = Utils::fromJsonString(reply.m_data);
Q_ASSERT(!replyObj.isEmpty()); Q_ASSERT(!replyObj.isEmpty());
const auto sha = replyObj[QStringLiteral("sha")].toString(); sha = replyObj[QStringLiteral("sha")].toString();
} else if (reply.m_error == QNetworkReply::ContentAccessDenied) { // File larger than 1M
// Get all file information under the warehouse directory
const auto fileInfo = QFileInfo(urlStr);
const auto urlFilePath = QUrl(fileInfo.path());
const auto fleName = fileInfo.fileName();
reply = vte::NetworkAccess::request(urlFilePath, rawHeader);
if (QNetworkReply::NoError == reply.m_error) {
const auto jsonArray = QJsonDocument::fromJson(reply.m_data).array();
for (auto i = jsonArray.begin(); i < jsonArray.end(); i++) {
if (!i->isObject()) {
continue;
}
const auto jsonObj = i->toObject();
const auto name = jsonObj[QStringLiteral("name")].toString();
if (name == fleName) {
sha = jsonObj[QStringLiteral("sha")].toString();
break;
}
}
}
}
if (sha.isEmpty()) { if (sha.isEmpty()) {
p_msg = tr("Failed to fetch SHA about the resource (%1) (%2).").arg(resourcePath, QString::fromUtf8(reply.m_data)); p_msg = tr("Failed to fetch SHA about the resource (%1) (%2).").arg(resourcePath, QString::fromUtf8(reply.m_data));
return false; return false;