lazy loading

Author: OmniTroid

src/animationlayer.cpp

@@ -2,6 +2,7 @@
 
 #include "aoapplication.h"
 #include "options.h"
+#include "webcache.h"
 
 #include <QRectF>
 #include <QThreadPool>
@@ -452,12 +453,23 @@ void CharacterAnimationLayer::loadCharacterEmote(QString character, QString file
   }
 
   int index = -1;
+  int non_placeholder_count = placeholder_fallback ? path_list.size() - 2 : path_list.size();
   QString file_path = ao_app->get_image_path(path_list, index);
   if (index != -1)
   {
     m_resolved_emote = prefixed_emote_list[index];
   }
 
+  // Trigger webcache download if actual character emote not found (fell back to placeholder or not found at all)
+  if ((index == -1 || index >= non_placeholder_count) && Options::getInstance().webcacheEnabled())
+  {
+    static const QStringList image_suffixes{".webp", ".apng", ".gif", ".png"};
+    for (int i = 0; i < non_placeholder_count; ++i)
+    {
+      ao_app->webcache()->resolveOrDownload(path_list[i].toQString(), image_suffixes);
+    }
+  }
+
   setFileName(file_path);
   setPlayOnce(play_once);
   setResizeMode(ao_app->get_scaling(ao_app->get_emote_property(character, fileName, "scaling")));
@@ -589,7 +601,15 @@ BackgroundAnimationLayer::BackgroundAnimationLayer(AOApplication *ao_app, QWidge
 
 void BackgroundAnimationLayer::loadAndPlayAnimation(QString fileName)
 {
-  QString file_path = ao_app->get_image_suffix(ao_app->get_background_path(fileName));
+  VPath vpath = ao_app->get_background_path(fileName);
+  QString file_path = ao_app->get_image_suffix(vpath);
+
+  // Trigger webcache download if file not found locally
+  if (file_path.isEmpty() && Options::getInstance().webcacheEnabled())
+  {
+    ao_app->webcache()->resolveOrDownload(vpath.toQString(), {".webp", ".apng", ".gif", ".png"});
+  }
+
 #ifdef DEBUG_MOVIE
   if (file_path.isEmpty())
   {

src/aomusicplayer.cpp

@@ -2,6 +2,7 @@
 
 #include "file_functions.h"
 #include "options.h"
+#include "webcache.h"
 
 #include <bass.h>
 
@@ -50,7 +51,15 @@ QString AOMusicPlayer::playStream(QString song, int streamId, bool loopEnabled,
   {
     flags |= BASS_STREAM_PRESCAN | BASS_UNICODE | BASS_ASYNCFILE;
 
-    f_path = ao_app->get_real_path(ao_app->get_music_path(song));
+    VPath vpath = ao_app->get_music_path(song);
+    f_path = ao_app->get_real_path(vpath);
+
+    // Trigger webcache download if file not found locally
+    if (f_path.isEmpty() && Options::getInstance().webcacheEnabled())
+    {
+      ao_app->webcache()->resolveOrDownload(vpath.toQString(), {".opus", ".ogg", ".mp3", ".wav"});
+    }
+
     newstream = BASS_StreamCreateFile(FALSE, f_path.utf16(), 0, 0, flags);
   }
 

src/path_functions.cpp

@@ -431,9 +431,6 @@ QString AOApplication::get_real_path(const VPath &vpath, const QStringList &suff
       asset_lookup_cache.insert(qHash(vpath), cached);
       return cached;
     }
-
-    // Initiate background download for future requests
-    m_webcache->resolveOrDownload(vpath.toQString(), suffixes);
   }
 
   // Not found in mount paths; check if the file is remote