From 6d1830ad860538ef58fd4a5e60bfaba6938e825e Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Tue, 9 Oct 2018 20:21:25 +0800
Subject: [PATCH] fix local image path with query parameters

---
 src/utils/vutils.cpp    | 6 +++---
 src/utils/vwebutils.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/utils/vutils.cpp b/src/utils/vutils.cpp
index 178555d2..022ec90b 100644
--- a/src/utils/vutils.cpp
+++ b/src/utils/vutils.cpp
@@ -247,7 +247,7 @@ QVector<ImageLink> VUtils::fetchImagesFromMarkdownFile(VFile *p_file,
 
         ImageLink link;
         link.m_url = imageUrl;
-        QFileInfo info(basePath, imageUrl);
+        QFileInfo info(basePath, purifyUrl(imageUrl));
         if (info.exists()) {
             if (info.isNativePath()) {
                 // Local file.
@@ -288,7 +288,7 @@ QVector<ImageLink> VUtils::fetchImagesFromMarkdownFile(VFile *p_file,
 QString VUtils::linkUrlToPath(const QString &p_basePath, const QString &p_url)
 {
     QString fullPath;
-    QFileInfo info(p_basePath, p_url);
+    QFileInfo info(p_basePath, purifyUrl(p_url));
     if (info.exists()) {
         if (info.isNativePath()) {
             // Local file.
@@ -569,7 +569,7 @@ bool VUtils::isImageURL(const QUrl &p_url)
 
 bool VUtils::isImageURLText(const QString &p_url)
 {
-    QFileInfo info(p_url);
+    QFileInfo info(purifyUrl(p_url));
     return QImageReader::supportedImageFormats().contains(info.suffix().toLower().toLatin1());
 }
 
diff --git a/src/utils/vwebutils.cpp b/src/utils/vwebutils.cpp
index 49a0cc92..5c559654 100644
--- a/src/utils/vwebutils.cpp
+++ b/src/utils/vwebutils.cpp
@@ -932,7 +932,7 @@ QString VWebUtils::dataURI(const QUrl &p_url, bool p_keepTitle) const
     QString uri;
     Q_ASSERT(!p_url.isRelative());
     QString file = p_url.isLocalFile() ? p_url.toLocalFile() : p_url.toString();
-    QString suffix(QFileInfo(file).suffix().toLower());
+    QString suffix(QFileInfo(VUtils::purifyUrl(file)).suffix().toLower());
 
     if (!QImageReader::supportedImageFormats().contains(suffix.toLatin1())) {
         return uri;