File Tracking Panel Redesign

_cmake/copy_styles_to_build_dir.cmake

@@ -24,6 +24,11 @@ if (NOT OMIT_FRONTEND_BUILD)
             "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/collapsible_section.css"
             "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/checkbox.css"
             "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/toast.css"
+            "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/progress_bar.css"
+            "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/progress_ring.css"
+            "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/badge.css"
+            "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/tab_strip.css"
+            "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/list_row.css"
             "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/themes/light.css"
         COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/styles/nui-file-explorer"
         COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/styles/5cript-nui-components"
@@ -51,6 +56,11 @@ if (NOT OMIT_FRONTEND_BUILD)
         COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/collapsible_section.css" "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/collapsible_section.css"
         COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/checkbox.css" "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/checkbox.css"
         COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/toast.css" "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/toast.css"
+        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/progress_bar.css" "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/progress_bar.css"
+        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/progress_ring.css" "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/progress_ring.css"
+        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/badge.css" "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/badge.css"
+        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/tab_strip.css" "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/tab_strip.css"
+        COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/list_row.css" "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/list_row.css"
         COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/themes/light.css" "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/themes/light.css"
         DEPENDS
             "${CMAKE_SOURCE_DIR}/nui-file-explorer/styles/file_grid.css"
@@ -76,6 +86,11 @@ if (NOT OMIT_FRONTEND_BUILD)
             "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/collapsible_section.css"
             "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/checkbox.css"
             "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/toast.css"
+            "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/progress_bar.css"
+            "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/progress_ring.css"
+            "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/badge.css"
+            "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/tab_strip.css"
+            "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/list_row.css"
             "${CMAKE_SOURCE_DIR}/dependencies/5cript-nui-components/styles/themes/light.css"
     )
 
@@ -105,6 +120,11 @@ if (NOT OMIT_FRONTEND_BUILD)
             "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/collapsible_section.css"
             "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/checkbox.css"
             "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/toast.css"
+            "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/progress_bar.css"
+            "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/progress_ring.css"
+            "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/badge.css"
+            "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/tab_strip.css"
+            "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/list_row.css"
             "${CMAKE_BINARY_DIR}/styles/5cript-nui-components/themes/light.css"
     )
 endif()

backend/include/backend/file_tracking/batching_remote.hpp

@@ -33,12 +33,22 @@ namespace FileTracking
          */
         using OnUploadEntryEnded = std::function<void(std::size_t index, UploadEnd const& ended)>;
 
+        /**
+         * @brief Called on the strand while an upload of a bulk is on its way, with the entry's index, never after the
+         *        bulk ended.
+         */
+        using OnUploadEntryProgress = std::function<void(std::size_t index, UploadProgress const& progress)>;
+
         /**
          * @brief Queues the uploads of @p requests, regular files that may create the directories above their
-         *        destination, as one operation.
+         *        destination, as one operation. The index of an entry is that of its request. @p onProgress may be
+         *        empty.
          */
-        virtual std::expected<void, std::string>
-        uploadAll(std::vector<UploadRequest> const& requests, OnUploadEntryEnded onEnded) = 0;
+        virtual std::expected<void, std::string> uploadAll(
+            std::vector<UploadRequest> const& requests,
+            OnUploadEntryEnded onEnded,
+            OnUploadEntryProgress onProgress
+        ) = 0;
 
         /**
          * @brief Queues the deletes of @p paths as one operation, a directory only when it is empty.
@@ -95,9 +105,10 @@ namespace FileTracking
         /**
          * @brief Gathers @p request into the next batch. It goes on its own when it creates no missing directories,
          *        refreshes the listing, is no regular file, is a large one, continues a partial file or is alone in
-         *        its batch.
+         *        its batch. @p onProgress hears what the inner remote tells of it.
          */
-        std::expected<void, std::string> upload(UploadRequest const& request, OnUploadEnded onEnded) override;
+        std::expected<void, std::string>
+        upload(UploadRequest const& request, OnUploadEnded onEnded, OnUploadProgress onProgress) override;
 
         /**
          * @brief An upload still gathered ends as cancelled without being sent, one on its way is stopped by the inner

backend/include/backend/file_tracking/bulk_entry_progress.hpp

@@ -0,0 +1,103 @@
+#pragma once
+
+#include <backend/file_tracking/tracker_remote.hpp>
+#include <shared_data/file_operations/bulk_progress.hpp>
+#include <shared_data/file_operations/transfer_progress.hpp>
+#include <paths/paths.hpp>
+
+#include <cstddef>
+#include <cstdint>
+#include <optional>
+#include <vector>
+
+namespace FileTracking
+{
+    /**
+     * @brief Turns the successive progress the operation queue tells of one bulk or directory upload into the
+     *        progress of each upload it carries, by the index of its request. An upload is told when its progress
+     *        changed, from the moment it started on its way or ended.
+     */
+    class BulkEntryProgress
+    {
+      public:
+        /**
+         * @brief An upload of a bulk of files. Its index is that of its request, which is its entry index in the
+         *        bulk.
+         */
+        struct File
+        {
+            Paths::LocalPath source;
+            /** @brief Its size when it was queued, until its transfer tells it. */
+            std::uint64_t sizeBytes{0};
+        };
+
+        /**
+         * @brief The progress of the upload at @p index.
+         */
+        struct EntryProgress
+        {
+            std::size_t index{0};
+            UploadProgress progress{};
+        };
+
+        /**
+         * @brief A bulk of @p files.
+         */
+        static BulkEntryProgress ofFiles(std::vector<File> files);
+
+        /**
+         * @brief The upload of the directory @p source to @p destination, the single upload at index 0. Its files
+         *        and bytes are the entries below it the bulk is through with, the left out ones too, as the queue
+         *        counts them.
+         */
+        static BulkEntryProgress ofDirectory(Paths::LocalPath source, Paths::RemotePath destination);
+
+        /**
+         * @brief The uploads whose progress changed with @p progress, the next snapshot of the bulk, by index.
+         */
+        std::vector<EntryProgress> update(SharedData::BulkProgress const& progress);
+
+      private:
+        struct Entry
+        {
+            File file;
+            /** @brief Seen on its way, it is done once it is no longer. */
+            bool started{false};
+            /** @brief Listed among the bulk's failed entries. */
+            bool leftOut{false};
+            /** @brief The last update that saw it on its way, 0 for none. */
+            std::uint64_t onItsWayIn{0u};
+            std::optional<UploadProgress> told{};
+        };
+
+        struct Directory
+        {
+            Paths::LocalPath source;
+            Paths::RemotePath destination;
+            std::optional<UploadProgress> told{};
+        };
+
+        BulkEntryProgress(std::vector<Entry> entries, std::optional<Directory> directory);
+
+        std::vector<EntryProgress> updateFiles(SharedData::BulkProgress const& progress);
+        std::vector<EntryProgress> updateDirectory(SharedData::BulkProgress const& progress);
+
+      private:
+        std::vector<Entry> entries_;
+        std::optional<Directory> directory_;
+        /** @brief The entries seen on their way that were not told done yet, by index. */
+        std::vector<std::size_t> started_{};
+        std::uint64_t updates_{0u};
+    };
+
+    /**
+     * @brief How far the single upload of the file or link @p source is, its transfer between its minimum and
+     *        maximum at @p progress.
+     */
+    UploadProgress uploadProgressOf(SharedData::TransferProgress const& progress, Paths::LocalPath const& source);
+
+    /**
+     * @brief Whether @p left and @p right tell the same.
+     */
+    bool sameProgress(UploadProgress const& left, UploadProgress const& right);
+}