2 files changed, 38 insertions, 15 deletions

diff --git a/include/AsyncImageLoader.hpp b/include/AsyncImageLoader.hpp
new file mode 100644
index 0000000..27e46e3
--- /dev/null
+++ b/include/AsyncImageLoader.hpp
@@ -0,0 +1,36 @@
+#pragma once
+
+#include <string>
+#include <SFML/System/Vector2.hpp>
+#include <SFML/Graphics/Texture.hpp>
+#include <memory>
+#include <future>
+
+namespace QuickMedia {
+    enum class LoadingState {
+        NOT_LOADED,
+        LOADING,
+        FINISHED_LOADING,
+        APPLIED_TO_TEXTURE
+    };
+
+    struct ThumbnailData {
+        bool referenced = false;
+        LoadingState loading_state = LoadingState::NOT_LOADED;
+        sf::Texture texture;
+        std::unique_ptr<sf::Image> image; // Set in another thread. This should be .reset after loading it into |texture|, to save memory
+    };
+
+    class AsyncImageLoader {
+    public:
+        // Returns false if the image loader is already loading an image. In that case, this function should be called again later.
+        // set |resize_target_size| to {0, 0} to disable resizing.
+        // |thumbnail_data.loading_state| has to be LoadingState::NOT_LOADED when calling this!
+        // Note: this method is not thread-safe
+        bool load_thumbnail(const std::string &url, bool local, sf::Vector2i resize_target_size, bool use_tor, std::shared_ptr<ThumbnailData> thumbnail_data);
+        void update();
+    private:
+        bool loading_image = false;
+        std::future<void> load_image_future;
+    };
+}
\ No newline at end of file
diff --git a/include/Body.hpp b/include/Body.hpp
index 60b976d..d2a3424 100644
--- a/include/Body.hpp
+++ b/include/Body.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "Text.hpp"
+#include "AsyncImageLoader.hpp"
 #include <SFML/Graphics/Text.hpp>
 #include <SFML/Graphics/Texture.hpp>
 #include <SFML/Graphics/RectangleShape.hpp>
@@ -154,23 +155,9 @@ namespace QuickMedia {
     private:
         void draw_item(sf::RenderWindow &window, BodyItem *item, const sf::Vector2f &pos, const sf::Vector2f &size, const float item_height, const int item_index, const Json::Value &content_progress);
     private:
-        enum class LoadingState {
-            NOT_LOADED,
-            LOADING,
-            FINISHED_LOADING,
-            APPLIED_TO_TEXTURE
-        };
-
-        struct ThumbnailData {
-            bool referenced = false;
-            LoadingState loading_state = LoadingState::NOT_LOADED;
-            sf::Texture texture;
-            std::unique_ptr<sf::Image> image; // Set in another thread, and then reset after loading it into |texture|
-        };
         Program *program;
-        void load_thumbnail_from_url(const std::string &url, bool local, sf::Vector2i thumbnail_resize_target_size, std::shared_ptr<ThumbnailData> thumbnail_data);
         std::unordered_map<std::string, std::shared_ptr<ThumbnailData>> item_thumbnail_textures;
-        bool loading_thumbnail;
+        AsyncImageLoader async_image_loader;
         int selected_item;
         int prev_selected_item;
         float page_scroll;