From f24743e381166a9d84fb499ad75a73ce57194d9d Mon Sep 17 00:00:00 2001
From: Gary Wang <git@blumia.net>
Date: Sat, 29 Mar 2025 13:41:55 +0800
Subject: [PATCH] feat: reload image when current image gets updated

This feature is sponsored by @EdgarHartel.

Issue: https://github.com/BLumia/pineapple-pictures/issues/143
---
 app/mainwindow.cpp | 20 ++++++++++++++++++--
 app/mainwindow.h   |  7 ++++++-
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/app/mainwindow.cpp b/app/mainwindow.cpp
index f89b82d..37489dd 100644
--- a/app/mainwindow.cpp
+++ b/app/mainwindow.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
+// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
 //
 // SPDX-License-Identifier: MIT
 
@@ -32,6 +32,7 @@
 #include <QFile>
 #include <QTimer>
 #include <QFileDialog>
+#include <QFileSystemWatcher>
 #include <QStandardPaths>
 #include <QStringBuilder>
 #include <QProcess>
@@ -47,6 +48,7 @@ MainWindow::MainWindow(QWidget *parent)
     : FramelessWindow(parent)
     , m_am(new ActionManager)
     , m_pm(new PlaylistManager(this))
+    , m_fileSystemWatcher(new QFileSystemWatcher(this))
 {
     if (Settings::instance()->stayOnTop()) {
         this->setWindowFlag(Qt::WindowStaysOnTopHint);
@@ -147,6 +149,8 @@ MainWindow::MainWindow(QWidget *parent)
     connect(m_pm->model(), &PlaylistModel::modelReset, this, std::bind(&MainWindow::galleryCurrent, this, false, false));
     connect(m_pm, &PlaylistManager::currentIndexChanged, this, std::bind(&MainWindow::galleryCurrent, this, true, false));
 
+    connect(m_fileSystemWatcher, &QFileSystemWatcher::fileChanged, this, std::bind(&MainWindow::galleryCurrent, this, false, true));
+
     QShortcut * fullscreenShorucut = new QShortcut(QKeySequence(QKeySequence::FullScreen), this);
     connect(fullscreenShorucut, &QShortcut::activated,
             this, &MainWindow::toggleFullscreen);
@@ -265,12 +269,17 @@ void MainWindow::galleryNext()
 void MainWindow::galleryCurrent(bool showLoadImageHintWhenEmpty, bool reloadImage)
 {
     QModelIndex index = m_pm->curIndex();
+    bool shouldResetfileWatcher = true;
     if (index.isValid()) {
-        if (reloadImage) m_graphicsView->showFileFromPath(m_pm->localFileByIndex(index));
+        const QString & localFilePath(m_pm->localFileByIndex(index));
+        if (reloadImage) m_graphicsView->showFileFromPath(localFilePath);
+        shouldResetfileWatcher = !updateFileWatcher(localFilePath);
         setWindowTitle(m_pm->urlByIndex(index).fileName());
     } else if (showLoadImageHintWhenEmpty && m_pm->totalCount() <= 0) {
         m_graphicsView->showText(QCoreApplication::translate("GraphicsScene", "Drag image here"));
     }
+
+    if (shouldResetfileWatcher) updateFileWatcher();
 }
 
 QStringList MainWindow::supportedImageFormats()
@@ -904,3 +913,10 @@ void MainWindow::on_actionQuitApp_triggered()
 {
     quitAppAction(false);
 }
+
+bool MainWindow::updateFileWatcher(const QString &basePath)
+{
+    m_fileSystemWatcher->removePaths(m_fileSystemWatcher->files());
+    if (!basePath.isEmpty()) return m_fileSystemWatcher->addPath(basePath);
+    return false;
+}
diff --git a/app/mainwindow.h b/app/mainwindow.h
index 2850901..c9b5a38 100644
--- a/app/mainwindow.h
+++ b/app/mainwindow.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 Gary Wang <wzc782970009@gmail.com>
+// SPDX-FileCopyrightText: 2025 Gary Wang <git@blumia.net>
 //
 // SPDX-License-Identifier: MIT
 
@@ -20,6 +20,7 @@
 QT_BEGIN_NAMESPACE
 class QGraphicsOpacityEffect;
 class QGraphicsView;
+class QFileSystemWatcher;
 QT_END_NAMESPACE
 
 class ActionManager;
@@ -111,6 +112,9 @@ private slots:
     void on_actionLocateInFileManager_triggered();
     void on_actionQuitApp_triggered();
 
+private:
+    bool updateFileWatcher(const QString & basePath = QString());
+
 private:
     ActionManager *m_am;
     PlaylistManager *m_pm;
@@ -119,6 +123,7 @@ private:
     QPropertyAnimation *m_fadeOutAnimation;
     QPropertyAnimation *m_floatUpAnimation;
     QParallelAnimationGroup *m_exitAnimationGroup;
+    QFileSystemWatcher *m_fileSystemWatcher;
     ToolButton *m_closeButton;
     ToolButton *m_prevButton;
     ToolButton *m_nextButton;