From 8995608ccaad5428e7bdbab116a5838c9ae31967 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Mon, 18 Nov 2024 14:06:07 +0100
Subject: [PATCH 01/32] chore: add dropdown button to channel name

---
 TelegramDownloader/Pages/FileManager.razor | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/TelegramDownloader/Pages/FileManager.razor b/TelegramDownloader/Pages/FileManager.razor
index bfacbd8..9bc58ef 100644
--- a/TelegramDownloader/Pages/FileManager.razor
+++ b/TelegramDownloader/Pages/FileManager.razor
@@ -5,6 +5,7 @@
 @using TelegramDownloader.Models
 @using TelegramDownloader.Pages.Partials
 @inject IFileService fs
+@inject ITelegramService ts
 @inject ILogger<FileManager> Logger
 @inject IJSRuntime JSRuntime;
 @inject NavigationManager MyNavigationManager;
@@ -19,10 +20,16 @@
     }
 </style>
 
-<h3>File Manager <span class="badge bg-secondary">@chatName</span></h3>
-
-<button class="btn" @onclick="exportData"><i class="bi bi-cloud-download"></i> Export</button>
-<button class="btn" @onclick="importData"><i class="bi bi-cloud-upload"></i> Import</button>
+<h3>
+    File Manager 
+    <Dropdown Color="DropdownColor.Secondary">
+        <DropdownToggleButton>@chatName</DropdownToggleButton>
+        <DropdownMenu>
+            <DropdownItem @onclick="exportData" Type="DropdownItemType.Button"><i class="bi bi-cloud-download"></i> Export</DropdownItem>
+            <DropdownItem @onclick="importData" Type="DropdownItemType.Button"><i class="bi bi-cloud-upload"></i> Import</DropdownItem>
+        </DropdownMenu>
+    </Dropdown>
+</h3>
 
 <ul class="nav nav-tabs">
     <li class="nav-item">
@@ -51,8 +58,7 @@
     {
         try
         {
-            bsi = await fs.GetSharedInfoById(id);
-            chatName = bsi.Name;
+            chatName = ts.getChatName(Convert.ToInt64(id));
         } catch(Exception ex)
         {
             Logger.LogError(ex, "Error on GetSharedInfoById");

From 8b4ecdae23be686d3fa4a77f48217c4f9b877d15 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Mon, 18 Nov 2024 23:23:51 +0100
Subject: [PATCH 02/32] feat: deleting shared feat: refresh after import feat:
 remember tab

---
 TelegramDownloader/Data/FileService.cs        |   6 +
 TelegramDownloader/Data/IFileService.cs       |   1 +
 TelegramDownloader/Data/db/DbService.cs       |  11 +
 TelegramDownloader/Data/db/IDbService.cs      |   2 +
 .../Pages/Modals/ImportDataModal.razor        |   8 +-
 TelegramDownloader/Shared/MainLayout.razor    |  10 +-
 TelegramDownloader/Shared/NavMenu.razor       | 363 ++++++++++--------
 TelegramDownloader/wwwroot/css/site.css       |  25 ++
 8 files changed, 259 insertions(+), 167 deletions(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index 83a3b06..1185e34 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -276,6 +276,12 @@ public async Task<BsonSharedInfoModel> GetSharedInfoById(string id)
             return await _db.getSingleFile(id);
         }
 
+        public async Task DeleteShared(string id, string collectionId)
+        {
+            await _db.DeleteSharedCollection(collectionId);
+            await _db.DeleteSharedInfo(id);
+        }
+
         public async Task<MemoryStream> exportAllData(string dbName)
         {
             var json = System.Text.Json.JsonSerializer.Serialize(await _db.getAllDatabaseData(dbName));
diff --git a/TelegramDownloader/Data/IFileService.cs b/TelegramDownloader/Data/IFileService.cs
index b98d96f..7c8c406 100644
--- a/TelegramDownloader/Data/IFileService.cs
+++ b/TelegramDownloader/Data/IFileService.cs
@@ -12,6 +12,7 @@ public interface IFileService
         Task<List<FileManagerDirectoryContent>> createFolder(string dbName, FolderCreateEventArgs<FileManagerDirectoryContent> args);
         void cleanTempFolder();
         Task<BsonSharedInfoModel> GetSharedInfoById(string id);
+        Task DeleteShared(string id, string collectionId);
         Task downloadFile(string dbName, List<FileManagerDirectoryContent> files, string targetPath, string? collectionId = null, string? channelId = null);
         Task downloadFile(string dbName, string path, List<string> files, string targetPath, string? collectionId = null, string? channelId = null);
         Task downloadFileToServer(string dbName, string path, string destPath);
diff --git a/TelegramDownloader/Data/db/DbService.cs b/TelegramDownloader/Data/db/DbService.cs
index 2e46c2c..cc37686 100644
--- a/TelegramDownloader/Data/db/DbService.cs
+++ b/TelegramDownloader/Data/db/DbService.cs
@@ -110,8 +110,19 @@ public async Task<BsonSharedInfoModel> InsertSharedInfo(BsonSharedInfoModel sim,
 
         }
 
+        public async Task DeleteSharedCollection(string collectionId, string dbName = SHARED_DB_NAME)
+        {
+            await getDatabase(dbName).DropCollectionAsync(collectionId);
+        }
+
+        public async Task DeleteSharedInfo(string id, string dbName = SHARED_DB_NAME, string collection = "info")
+        {
+            await getDatabase(dbName).GetCollection<BsonSharedInfoModel>(collection).DeleteOneAsync(x => x.Id == id);
+        }
+
         public async Task<List<BsonSharedInfoModel>> getSharedInfoList(string dbName = SHARED_DB_NAME, string collection = "info", string? filter = null)
         {
+            if (collection == null)
             if (collection == null)
                 collection = "info";
             List<BsonSharedInfoModel> list = new List<BsonSharedInfoModel>();
diff --git a/TelegramDownloader/Data/db/IDbService.cs b/TelegramDownloader/Data/db/IDbService.cs
index 28a5e57..88db984 100644
--- a/TelegramDownloader/Data/db/IDbService.cs
+++ b/TelegramDownloader/Data/db/IDbService.cs
@@ -10,6 +10,8 @@ public interface IDbService
         Task<BsonSharedInfoModel> InsertSharedInfo(BsonSharedInfoModel sim, string dbName = DbService.SHARED_DB_NAME, string collection = "info");
         Task<List<BsonSharedInfoModel>> getSharedInfoList(string dbName = DbService.SHARED_DB_NAME, string collection = "info", string? filter = null);
         Task<BsonSharedInfoModel> getSingleFile(string id, string dbName = DbService.SHARED_DB_NAME, string collection = "info");
+        Task DeleteSharedCollection(string collectionId, string dbName = DbService.SHARED_DB_NAME);
+        Task DeleteSharedInfo(string id, string dbName = DbService.SHARED_DB_NAME, string collection = "info");
         Task addBytesToFolder(string dbName, string folderId, long bytes, string collectionName = "directory");
         Task checkAndSetDirectoryHasChild(string dbName, string id, string collectionName = "directory");
         Task<BsonFileManagerModel> copyItem(string dbName, string sourceId, FileManagerDirectoryContent target, string targetPath, bool isFile, string collectionName = "directory");
diff --git a/TelegramDownloader/Pages/Modals/ImportDataModal.razor b/TelegramDownloader/Pages/Modals/ImportDataModal.razor
index abad412..82e9d5c 100644
--- a/TelegramDownloader/Pages/Modals/ImportDataModal.razor
+++ b/TelegramDownloader/Pages/Modals/ImportDataModal.razor
@@ -58,6 +58,8 @@
 </div>
 
 @code {
+    [Parameter]
+    public EventCallback OnCloseCallback { get; set; }
     [Parameter]
     public string? id { get; set; }
     [Parameter]
@@ -83,10 +85,14 @@
         StateHasChanged();
     }
 
-    public void Close()
+    public async Task Close()
     {
         ModalDisplay = "none";
         ModalClass = "";
+        if (OnCloseCallback.HasDelegate)
+        {
+            await OnCloseCallback.InvokeAsync(null);
+        }
         StateHasChanged();
     }
 
diff --git a/TelegramDownloader/Shared/MainLayout.razor b/TelegramDownloader/Shared/MainLayout.razor
index f507c4f..2b6c954 100644
--- a/TelegramDownloader/Shared/MainLayout.razor
+++ b/TelegramDownloader/Shared/MainLayout.razor
@@ -27,7 +27,7 @@
 
 <div class="page">
     <div class="sidebar">
-        <NavMenu OnClickCallback="openOffCanvasMenu" OnClickOpenImportCallback="openImportModalMenu" />
+        <NavMenu @ref="menu" OnClickCallback="openOffCanvasMenu" OnClickOpenImportCallback="openImportModalMenu" />
     </div>
 
     <main>
@@ -58,7 +58,7 @@
                 </div>
             </BodyTemplate>
         </Offcanvas>
-        <TelegramDownloader.Pages.Modals.ImportDataModal isShared=true @ref="ImportModal"></TelegramDownloader.Pages.Modals.ImportDataModal>
+        <TelegramDownloader.Pages.Modals.ImportDataModal isShared=true @ref="ImportModal" OnCloseCallback="reloadMenu"></TelegramDownloader.Pages.Modals.ImportDataModal>
         
         <Modal IsServiceModal="true" />
         <Toasts class="p-3" AutoHide="true" Delay="4000" Placement="ToastsPlacement.TopRight" />
@@ -71,6 +71,7 @@
     private Offcanvas offcanvas = default!;
     private Pages.Modals.ImportDataModal ImportModal { get; set; }
     private GithubVersionModel LastVersion { get; set; }
+    private NavMenu menu { get; set; }
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
@@ -90,6 +91,11 @@
 
     }
 
+    private async Task reloadMenu()
+    {
+        menu.RefreshChannels();
+    }
+
 
     private async Task ShowModalVersion(ModalType modalType)
     {
diff --git a/TelegramDownloader/Shared/NavMenu.razor b/TelegramDownloader/Shared/NavMenu.razor
index 2935c3c..9cf4c94 100644
--- a/TelegramDownloader/Shared/NavMenu.razor
+++ b/TelegramDownloader/Shared/NavMenu.razor
@@ -2,32 +2,16 @@
 @using TL
 @using TelegramDownloader.Data.db
 @using TelegramDownloader.Models
+@using Microsoft.AspNetCore.Components.Server.ProtectedBrowserStorage
+@inject ProtectedSessionStorage ProtectedSessionStore
 @inject NavigationManager uriHelper;
 @inject IDbService db;
-@inject ITelegramService ts
-@inject IJSRuntime JS
+@inject IFileService fs;
+@inject ITelegramService ts;
+@inject IJSRuntime JS;
 
 <style>
-    .ellipsis {
-        text-overflow: ellipsis;
-    }
-
-    .navclass {
-        color: white
-    }
-
-    .groupbtnactionclass {
-        color: antiquewhite;
-        --bs-btn-border-color: #0d6efd00;
-        --bs-btn-hover-bg: #00f2ff4a;
-        --bs-btn-active-bg: #7b9ccd75;
-    }
-
-    .groupbtnclass {
-        width: 90%;
-        padding-left: 10%;
-        padding-bottom: 5%;
-    }
+    
 </style>
 
 <div class="top-row ps-3 navbar navbar-dark">
@@ -57,155 +41,171 @@
                 <button type="button" class="btn btn-outline-primary groupbtnactionclass" @onclick="showPlayer"><i class="bi bi-boombox"></i></button>
                 <button class="btn groupbtnactionclass" type="button" @onclick="HandleThreeDots"><i class="bi bi-three-dots"></i></button>
             </div>
-            <nav>
-                <div class="nav nav-tabs" id="nav-tab" role="tablist">
-                    <button class="nav-link navclass active" id="nav-mine-tab" data-bs-toggle="tab" data-bs-target="#nav-mine" type="button" role="tab" aria-controls="nav-mine" aria-selected="true"><i class="bi bi-chat-square-heart"></i> Mine</button>
-                    <button class="nav-link navclass" id="nav-fav-tab" data-bs-toggle="tab" data-bs-target="#nav-fav" type="button" role="tab" aria-controls="nav-fav" aria-selected="false"><i class="bi bi-bookmark-star"></i> Fav</button>
-                    <button class="nav-link navclass" id="nav-sha-tab" data-bs-toggle="tab" data-bs-target="#nav-sha" type="button" role="tab" aria-controls="nav-sha" aria-selected="false"><i class="bi bi-share"></i> Shared</button>
-                    <button class="nav-link navclass" id="nav-all-tab" data-bs-toggle="tab" data-bs-target="#nav-all" type="button" role="tab" aria-controls="nav-all" aria-selected="false"><i class="bi bi-chat-square-text"></i> All</button>
-                </div>
-            </nav>
-        </div>
-
-        <div class="tab-content" id="nav-tabContent">
-            <div class="tab-pane fade show active" id="nav-mine" role="tabpanel" aria-labelledby="nav-mine-tab">
-                @foreach (ChatViewBase cb in mineChats)
-                {
-                    <div class="row">
-                        <div class="col-1" style="align-content: space-around; padding-left: 5%; ">
-                            @if (isInFavourite(cb.chat.ID))
-                            {
-                                <span style="color:white; cursor: pointer;" class="bi bi-star-fill" @onclick="async () => await removeStar(cb.chat.ID)"></span>
-                            }
-                            else
-                            {
-                                <span style="color:white; cursor: pointer;" class="bi bi-star" @onclick="async () => await setStar(cb.chat.ID)"></span>
-                            }
-                        </div>
-                        <div class="col-9">
-
-                            <div class="nav-item" style="padding:inherit;" @onclick="ToggleNavMenu">
-                                <NavLink class="nav-link ellipsis" href="@($"/fetchdata/{cb.chat.ID}")" Match="NavLinkMatch.All">
-                                    <span aria-hidden="true">
-
-
-                                    </span>
-                                    <span class="text-truncate">@cb.chat.Title</span>
-                                </NavLink>
-
+           
+
+            <Tabs EnableFadeEffect="true" @ref="tabs" Id="menutab" OnShowing="@(args => OnTabShowingAsync(args))">
+                <Tab Active="true" Title="Mine" Name="Mine">
+                    <TitleTemplate >
+                        <i class="bi bi-chat-square-heart"></i> Mine
+                    </TitleTemplate>
+                    <Content>
+                        @foreach (ChatViewBase cb in mineChats)
+                        {
+                            <div class="row">
+                                <div class="col-1" style="align-content: space-around; padding-left: 5%; ">
+                                    @if (isInFavourite(cb.chat.ID))
+                                    {
+                                        <span style="color:white; cursor: pointer;" class="bi bi-star-fill" @onclick="async () => await removeStar(cb.chat.ID)"></span>
+                                    }
+                                    else
+                                    {
+                                        <span style="color:white; cursor: pointer;" class="bi bi-star" @onclick="async () => await setStar(cb.chat.ID)"></span>
+                                    }
+                                </div>
+                                <div class="col-9">
+
+                                    <div class="nav-item" style="padding:inherit;" @onclick="ToggleNavMenu">
+                                        <NavLink class="nav-link ellipsis" href="@($"/fetchdata/{cb.chat.ID}")" Match="NavLinkMatch.All">
+                                            <span aria-hidden="true">
+
+
+                                            </span>
+                                            <span class="text-truncate">@cb.chat.Title</span>
+                                        </NavLink>
+
+                                    </div>
+                                </div>
+                                <div class="col-2" style="position: relative; padding-top: 2%; padding-left: 0;">
+                                    <button class="btn" type="button" style="padding:0" data-bs-toggle="dropdown" aria-expanded="false" @onclick="@(async () => await goTo($"/fm/{cb.chat.ID}"))">
+                                        <span style="color:white" class="bi bi-folder"></span>
+                                    </button>
+                                </div>
                             </div>
-                        </div>
-                        <div class="col-2" style="position: relative; padding-top: 2%; padding-left: 0;">
-                            <button class="btn" type="button" style="padding:0" data-bs-toggle="dropdown" aria-expanded="false" @onclick="@(async () => await goTo($"/fm/{cb.chat.ID}"))">
-                                <span style="color:white" class="bi bi-folder"></span>
-                            </button>
-                        </div>
-                    </div>
-                }
-            </div>
-            <div class="tab-pane fade" id="nav-sha" role="tabpanel" aria-labelledby="nav-sha-tab">
-                <div class="row">
-                    <div class="btn-group" role="group" aria-label="Basic outlined example">
-                        <button class="btn btn-outline-warning" type="button" @onclick="HandleImportMenu"><i class="bi bi-cloud-upload"></i> Import</button>
-                        <button type="button" class="btn btn-outline-info"><i class="bi bi-grid-3x3-gap-fill"></i> List</button>
-                    </div>
-                </div>
-                @foreach (BsonSharedInfoModel sc in sharedChats)
-                {
-                    <div class="row">
-                        <div class="col-1" style="align-content: space-around; padding-left: 5%; ">
-                            <span style="color:white; cursor: pointer;" class="bi bi-star-fill" ></span>
-                        </div>
-                        <div class="col-9">
-
-                            <div class="nav-item" style="padding:inherit;" @onclick="ToggleNavMenu">
-                                <NavLink class="nav-link ellipsis" href="@($"/shared/{sc.Id}")" Match="NavLinkMatch.All">
-                                    <span aria-hidden="true">
-
-
-                                    </span>
-                                    <span class="text-truncate">@sc.Name</span>
-                                </NavLink>
-
+                        }
+                    </Content>
+                </Tab>
+                <Tab Title="Fav" Name="Fav">
+                    <TitleTemplate>
+                        <i class="bi bi-bookmark-star"></i> Fav
+                    </TitleTemplate>
+                    <Content>
+                        @foreach (ChatViewBase cb in favouriteChats)
+                        {
+                            <div class="row">
+                                <div class="col-1" style="align-content: space-around; padding-left: 5%; ">
+                                    <span style="color:white; cursor: pointer;" class="bi bi-star-fill" @onclick="async () => await removeStar(cb.chat.ID)"></span>
+                                </div>
+                                <div class="col-9">
+
+                                    <div class="nav-item" style="padding:inherit;" @onclick="ToggleNavMenu">
+                                        <NavLink class="nav-link ellipsis" href="@($"/fetchdata/{cb.chat.ID}")" Match="NavLinkMatch.All">
+                                            <span aria-hidden="true">
+
+
+                                            </span>
+                                            <span class="text-truncate">@cb.chat.Title</span>
+                                        </NavLink>
+
+                                    </div>
+                                </div>
+                                <div class="col-2" style="position: relative; padding-top: 2%; padding-left: 0;">
+                                    <button class="btn" type="button" style="padding:0" data-bs-toggle="dropdown" aria-expanded="false" @onclick="@(async () => await goTo($"/fm/{cb.chat.ID}"))">
+                                        <span style="color:white" class="bi bi-folder"></span>
+                                    </button>
+                                </div>
                             </div>
-                        </div>
-                        <div class="col-2" style="position: relative; padding-top: 2%; padding-left: 0;">
-                            <button class="btn" type="button" style="padding:0" data-bs-toggle="dropdown" aria-expanded="false" @onclick="@(async () => await goTo($"/shared/{sc.Id}"))">
-                                <span style="color:white" class="bi bi-folder"></span>
-                            </button>
-                        </div>
-                    </div>
-                }
-            </div>
-            <div class="tab-pane fade" id="nav-fav" role="tabpanel" aria-labelledby="nav-fav-tab">
-                @foreach (ChatViewBase cb in favouriteChats)
-                {
-                    <div class="row">
-                        <div class="col-1" style="align-content: space-around; padding-left: 5%; ">
-                            <span style="color:white; cursor: pointer;" class="bi bi-star-fill" @onclick="async () => await removeStar(cb.chat.ID)"></span>
-                        </div>
-                        <div class="col-9">
-
-                            <div class="nav-item" style="padding:inherit;" @onclick="ToggleNavMenu">
-                                <NavLink class="nav-link ellipsis" href="@($"/fetchdata/{cb.chat.ID}")" Match="NavLinkMatch.All">
-                                    <span aria-hidden="true">
-
-
-                                    </span>
-                                    <span class="text-truncate">@cb.chat.Title</span>
-                                </NavLink>
-
+                        }
+                    </Content>
+                </Tab>
+                <Tab Title="Shared" Name="Shared">
+                    <TitleTemplate>
+                        <i class="bi bi-share"></i> Shared
+                    </TitleTemplate>
+                    <Content>
+                        <div class="row">
+                            <div class="btn-group" role="group" aria-label="Basic outlined example">
+                                <button class="btn btn-outline-warning" type="button" @onclick="HandleImportMenu"><i class="bi bi-cloud-upload"></i> Import</button>
+                                <button type="button" class="btn btn-outline-info"><i class="bi bi-grid-3x3-gap-fill"></i> List</button>
                             </div>
                         </div>
-                        <div class="col-2" style="position: relative; padding-top: 2%; padding-left: 0;">
-                            <button class="btn" type="button" style="padding:0" data-bs-toggle="dropdown" aria-expanded="false" @onclick="@(async () => await goTo($"/fm/{cb.chat.ID}"))">
-                                <span style="color:white" class="bi bi-folder"></span>
-                            </button>
-                        </div>
-                    </div>
-                }
-            </div>
-            <div class="tab-pane fade" id="nav-all" role="tabpanel" aria-labelledby="nav-all-tab">
-                @foreach (ChatViewBase cb in sChats)
-                {
-                    <div class="row">
-                        <div class="col-1" style="align-content: space-around; padding-left: 5%; ">
-                            @if(isInFavourite(cb.chat.ID)) 
-                            {
-                                <span style="color:white; cursor: pointer;" class="bi bi-star-fill" @onclick="async () => await removeStar(cb.chat.ID)"></span>
-                            } else
-                            {
-                                <span style="color:white; cursor: pointer;" class="bi bi-star" @onclick="async () => await setStar(cb.chat.ID)"></span>
-                            }
-                            
-                        </div>
-                        <div class="col-9">
-                            <div class="nav-item" style="padding:inherit;" @onclick="ToggleNavMenu">
-                                <NavLink class="nav-link ellipsis" href="@($"/fetchdata/{cb.chat.ID}")" Match="NavLinkMatch.All">
-                                    <span aria-hidden="true">
-                                        @*  @if (cb.chat.Photo != null)
+                        @foreach (BsonSharedInfoModel sc in sharedChats)
+                        {
+                            <div class="row">
+                                <div class="col-1" style="align-content: space-around; padding-left: 5%; ">
+                                    <span style="color:white; cursor: pointer;" class="bi bi-trash" @onclick="async () => await removeShared(sc.Id, sc.CollectionId)"></span>
+                                </div>
+                                <div class="col-9">
+
+                                    <div class="nav-item" style="padding:inherit;" @onclick="ToggleNavMenu">
+                                        <NavLink class="nav-link ellipsis" @onclick="@(async () => await goTo($"/shared/{sc.Id}"))" Match="NavLinkMatch.All">
+                                            <span aria-hidden="true">
+
+
+                                            </span>
+                                            <span class="text-truncate">@sc.Name</span>
+                                        </NavLink>
+
+                                    </div>
+                                </div>
+                                <div class="col-2" style="position: relative; padding-top: 2%; padding-left: 0;">
+                                    <button class="btn" type="button" style="padding:0" data-bs-toggle="dropdown" aria-expanded="false" @onclick="@(async () => await goTo($"/shared/{sc.Id}"))">
+                                        <span style="color:white" class="bi bi-folder"></span>
+                                    </button>
+                                </div>
+                            </div>
+                        }
+                    </Content>
+                </Tab>
+                <Tab Title="All" Name="All">
+                    <TitleTemplate>
+                        <i class="bi bi-chat-square-text"></i> All
+                    </TitleTemplate>
+                    <Content>
+                        @foreach (ChatViewBase cb in sChats)
+                        {
+                            <div class="row">
+                                <div class="col-1" style="align-content: space-around; padding-left: 5%; ">
+                                    @if (isInFavourite(cb.chat.ID))
                                     {
-                                    <img src="data:image/jpg;base64, @cb.img64" alt="photo" style="width:1vw;" />
-                                    } *@
-
-                                    </span>
-                                    <span class="text-truncate">@cb.chat.Title</span>
-                                </NavLink>
-
+                                        <span style="color:white; cursor: pointer;" class="bi bi-star-fill" @onclick="async () => await removeStar(cb.chat.ID)"></span>
+                                    }
+                                    else
+                                    {
+                                        <span style="color:white; cursor: pointer;" class="bi bi-star" @onclick="async () => await setStar(cb.chat.ID)"></span>
+                                    }
+
+                                </div>
+                                <div class="col-9">
+                                    <div class="nav-item" style="padding:inherit;" @onclick="ToggleNavMenu">
+                                        <NavLink class="nav-link ellipsis" href="@($"/fetchdata/{cb.chat.ID}")" Match="NavLinkMatch.All">
+                                            <span aria-hidden="true">
+                                                @*  @if (cb.chat.Photo != null)
+                                            {
+                                            <img src="data:image/jpg;base64, @cb.img64" alt="photo" style="width:1vw;" />
+                                            } *@
+
+                                            </span>
+                                            <span class="text-truncate">@cb.chat.Title</span>
+                                        </NavLink>
+
+                                    </div>
+                                </div>
+                                <div class="col-2" style="position: relative; padding-top: 2%; padding-left: 0;">
+
+                                    <button class="btn" type="button" style="padding:0" data-bs-toggle="dropdown" aria-expanded="false" @onclick="@(async () => await goTo($"/fm/{cb.chat.ID}"))">
+                                        <span style="color:white" class="bi bi-folder"></span>
+                                    </button>
+
+                                </div>
                             </div>
-                        </div>
-                        <div class="col-2" style="position: relative; padding-top: 2%; padding-left: 0;">
-
-                            <button class="btn" type="button" style="padding:0" data-bs-toggle="dropdown" aria-expanded="false" @onclick="@(async () => await goTo($"/fm/{cb.chat.ID}"))">
-                                <span style="color:white" class="bi bi-folder"></span>
-                            </button>
-
-                        </div>
-                    </div>
-                }
-            </div>
+                        }
+                    </Content>
+                </Tab>
+            </Tabs>
         </div>
 
+      
+
 
     </nav>
     
@@ -219,6 +219,7 @@
     [Parameter] public EventCallback OnClickCallback { get; set; }
     [Parameter] public EventCallback OnClickOpenImportCallback { get; set; }
 
+    Tabs tabs = default!;
 
     private List<ChatViewBase> sChats = new List<ChatViewBase>();
     private List<ChatViewBase> allChats = new List<ChatViewBase>();
@@ -244,6 +245,32 @@
         // }
     }
 
+    private async Task OnTabShowingAsync(TabsEventArgs args)
+    {
+        await ProtectedSessionStore.SetAsync("tabmenu", args.ActiveTabTitle);
+    }
+
+    private async Task getActiveTab()
+    {
+        var tab = await ProtectedSessionStore.GetAsync<string>("tabmenu");
+        if (!tab.Success || string.IsNullOrEmpty(tab.Value))
+        {
+            await tabs.ShowTabByNameAsync("Mine");
+        } else
+        {
+            await tabs.ShowTabByNameAsync(tab.Value);
+        }
+    }
+
+    private async Task removeShared(string id, string collecionId)
+    {
+        PreloadService.Show(SpinnerColor.Light, "Deleting shared...");
+        await fs.DeleteShared(id, collecionId);
+        await OnInitializedAsync();
+        PreloadService.Hide();
+    }
+    // => messages.Add(new("OnShowing", args.ActiveTabTitle, args.PreviousActiveTabTitle));
+
     private async Task HandleThreeDots()
     {
         ToggleNavMenu();
@@ -265,7 +292,7 @@
     }
 
 
-    private async Task RefreshChannels()
+    public async Task RefreshChannels()
     {
         PreloadService.Show(SpinnerColor.Light, "Loading data...");
         allChats = await ts.getAllChats();
@@ -325,6 +352,14 @@
 
     }
 
+    protected override async Task OnAfterRenderAsync(bool firstRender)
+    {
+        if (firstRender)
+        {
+            await getActiveTab();
+        }
+    }
+
     protected override async Task OnInitializedAsync()
     {
         allChats = await ts.getAllSavedChats();
diff --git a/TelegramDownloader/wwwroot/css/site.css b/TelegramDownloader/wwwroot/css/site.css
index d8baa0b..fb6f68c 100644
--- a/TelegramDownloader/wwwroot/css/site.css
+++ b/TelegramDownloader/wwwroot/css/site.css
@@ -77,3 +77,28 @@ a, .btn-link {
     white-space: nowrap;
     scrollbar-width: thin;
 }
+
+.ellipsis {
+    text-overflow: ellipsis;
+}
+
+#menutab .nav-link {
+    color: white;
+}
+
+    #menutab .active {
+        color: black;
+    }
+
+.groupbtnactionclass {
+    color: antiquewhite;
+    --bs-btn-border-color: #0d6efd00;
+    --bs-btn-hover-bg: #00f2ff4a;
+    --bs-btn-active-bg: #7b9ccd75;
+}
+
+.groupbtnclass {
+    width: 90%;
+    padding-left: 10%;
+    padding-bottom: 5%;
+}
\ No newline at end of file

From 35a32a687bb213712c152eac8cf39fa28835a55c Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Tue, 19 Nov 2024 16:16:15 +0100
Subject: [PATCH 03/32] chore: improves

---
 TelegramDownloader/Data/FileService.cs        |   2 +-
 TelegramDownloader/Data/ITelegramService.cs   |   1 +
 TelegramDownloader/Data/TelegramService.cs    |   5 +
 TelegramDownloader/Pages/Index.razor          | 138 +++++++++++++-----
 .../Partials/impl/LocalFileManagerImpl.razor  |  15 +-
 TelegramDownloader/Shared/NavMenu.razor       |   4 +-
 TelegramDownloader/Shared/SurveyPrompt.razor  |  16 --
 TelegramDownloader/TelegramDownloader.csproj  |   5 +-
 8 files changed, 118 insertions(+), 68 deletions(-)
 delete mode 100644 TelegramDownloader/Shared/SurveyPrompt.razor

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index 1185e34..8a8ca34 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -651,7 +651,7 @@ public async Task downloadFile(string dbName, List<FileManagerDirectoryContent>
                     if (!itemFile.IsFile)
                     {
                         Directory.CreateDirectory(System.IO.Path.Combine(currentFilePath, itemFile.Name));
-                        var filesInDir = collectionId == null ? await _db.getAllFilesInDirectoryPath(dbName, itemFile.FilterPath + itemFile.Name + "/") : await _db.getAllFilesInDirectoryPath(dbName, itemFile.FilterPath + itemFile.Name + "/", collectionId);
+                        var filesInDir = collectionId == null ? await _db.getAllFilesInDirectoryPath(dbName, itemFile.FilterPath == "" ? "/" : itemFile.FilterPath + itemFile.Name + "/") : await _db.getAllFilesInDirectoryPath(dbName, itemFile.FilterPath == "" ?  "/" : itemFile.FilterPath + itemFile.Name + "/", collectionId);
                         if (filesInDir.Count() > 0)
                         {
                             await downloadFile(dbName, filesInDir.Select(x => x.toFileManagerContent()).ToList(), System.IO.Path.Combine(currentTargetPath, itemFile.Name).Replace("\\", "/"), collectionId, channelId);
diff --git a/TelegramDownloader/Data/ITelegramService.cs b/TelegramDownloader/Data/ITelegramService.cs
index c8decb7..395f3a3 100644
--- a/TelegramDownloader/Data/ITelegramService.cs
+++ b/TelegramDownloader/Data/ITelegramService.cs
@@ -10,6 +10,7 @@ public interface ITelegramService
         bool checkChannelExist(string id);
         bool checkUserLogin();
         Task deleteFile(string chatId, int idMessage);
+        Task<User> CallQrGenerator(Action<string> func, CancellationToken ct, bool logoutFirst = false);
         Task<string> DownloadFile(ChatMessages message, string fileName = null, string folder = null, DownloadModel model = null);
         Task<Stream> DownloadFileAndReturn(ChatMessages message, Stream ms = null, string fileName = null, string folder = null, DownloadModel model = null);
         Task<List<ChatViewBase>> GetFouriteChannels(bool mustRefresh = true);
diff --git a/TelegramDownloader/Data/TelegramService.cs b/TelegramDownloader/Data/TelegramService.cs
index af67c7e..d0efe00 100644
--- a/TelegramDownloader/Data/TelegramService.cs
+++ b/TelegramDownloader/Data/TelegramService.cs
@@ -48,6 +48,11 @@ private void newClient()
 
         }
 
+        public async Task<User> CallQrGenerator(Action<string> func, CancellationToken ct, bool logoutFirst = false)
+        {
+            return await client.LoginWithQRCode(func, logoutFirst: logoutFirst, ct: ct);
+        }
+
         public async Task<User> GetUser()
         {
             return client.User;
diff --git a/TelegramDownloader/Pages/Index.razor b/TelegramDownloader/Pages/Index.razor
index b6af701..8136dcc 100644
--- a/TelegramDownloader/Pages/Index.razor
+++ b/TelegramDownloader/Pages/Index.razor
@@ -1,11 +1,14 @@
 @layout EmptyLayout
 @page "/"
+@implements IDisposable
 
+@using QRCoder
 @using TelegramDownloader.Data
 @using TelegramDownloader.Models
 @inject ITelegramService ts
 @inject NavigationManager NavManager
 @inject IJSRuntime JSRuntime;
+@inject PreloadService preloadService
 
 <style>
     .form-signin {
@@ -19,55 +22,66 @@
         padding-top: inherit;
     }
 </style>
+<Preload LoadingText="Loading..." />
 <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/intl-tel-input@23.0.12/build/css/intlTelInput.css">
 
 <PageTitle>Login</PageTitle>
 
-@if(Model.type != null) {
+@if (Model != null && Model.type != null)
+{
 <div class="container form-signin">
     <div class="text-center">
         <img src="https://static.vecteezy.com/system/resources/previews/023/986/534/large_2x/telegram-logo-telegram-logo-transparent-telegram-icon-transparent-free-free-png.png" alt="Telegram logo" style="max-width: -webkit-fill-available;" />
-        <EditForm class="form-signin mb-4" Model="Model" OnSubmit="Submit" FormName="LoginModel">
-            @switch (Model.type)
-            {
-                case "phone":
-                    <div class="form-group">
-                        <label for="phone">Teléfono</label>
-                        <InputText class="form-control" id="phone" type="text" @bind-Value="Model!.value" aria-describedby="phone" maxlength="12" data-mask="+00.000.00.00.00" placeholder="Teléfono" />
-                    </div>
-                    break;
-                case "vc":
-                    <div class="form-group">
-                        <label for="code">Código</label>
-                        <InputText class="form-control" id="code" maxlength="5" type="text" @bind-Value="Model!.value" />
-                    </div>
-                    break;
-                case "pass":
-                    <div class="form-group">
-                        <label for="pass">Contraseña</label>
-                        <InputText class="form-control" id="pass" type="password" @bind-Value="Model!.value" />
-                    </div>
-                    break;
-                case "ok":
-                    <span> Authenticado </span>
-                    break;
-            }
-            <div class="form-group buttons">
 
-                @if (Model.type == "ok")
+            <EditForm class="form-signin mb-4" Model="Model" OnSubmit="Submit" FormName="LoginModel">
+                @switch (Model.type)
                 {
-                    <button class="btn btn-info" @onclick="Salir" type="button">Desconectar</button>
+                    case "phone":
+                        <div class="form-group">
+                            <label for="phone">Teléfono</label>
+                            <InputText class="form-control" id="phone" type="text" @bind-Value="Model!.value" aria-describedby="phone" maxlength="12" data-mask="+00.000.00.00.00" placeholder="Teléfono" />
+                        </div>
+                        break;
+                    case "vc":
+                        <div class="form-group">
+                            <label for="code">Código</label>
+                            <InputText class="form-control" id="code" maxlength="5" type="text" @bind-Value="Model!.value" />
+                        </div>
+                        break;
+                    case "pass":
+                        <div class="form-group">
+                            <label for="pass">Contraseña</label>
+                            <InputText class="form-control" id="pass" type="password" @bind-Value="Model!.value" />
+                        </div>
+                        break;
+                    case "ok":
+                        <span> Authenticado </span>
+                        break;
                 }
-                else
-                {
-                    <button class="btn btn-info" type="submit">Send</button>
-                        @if(Model.type != null && Model.type != "phone")
+                <div class="form-group buttons">
+
+                    @if (Model.type == "ok")
+                    {
+                        <button class="btn btn-info" @onclick="Salir" type="button">Desconectar</button>
+                    }
+                    else
+                    {
+                        <button class="btn btn-info" type="submit">Send</button>
+                        @if (Model.type != null && Model.type != "phone")
                         {
                             <button class="btn btn-warning" @onclick="Cancel">Cancel</button>
                         }
+                    }
+                </div>
+                @if (!string.IsNullOrEmpty(imageString))
+                {
+                    <img src="data:image;base64, @imageString" />
                 }
-            </div>
-        </EditForm>
+
+            </EditForm>
+       
+            
+            
     </div>
     </div>
 } else
@@ -88,13 +102,17 @@
 @code {
     // [SupplyParameterFromForm]
     public LoginModel? Model { get; set; } = null;
+    private CancellationToken cTokenQr { get; set; }
+    CancellationTokenSource source { get; set; }
+    private string imageString { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
         Model ??= new();
         Model.type = await ts.checkAuth(Model.value);
         StateHasChanged();
-        isLogin();
+        await isLogin();
+        
 
     }
 
@@ -121,13 +139,44 @@
 
         Model.value = "";
         StateHasChanged();
-        isLogin();
+        await isLogin();
         // Logger.LogInformation("Id = {Id}", Model?.Id);
     }
 
-    private void isLogin()
+    private async Task isLogin()
+    {
+        if (Model.type == "ok") 
+        {
+            if (source != null)
+            {
+                if (source.Token.CanBeCanceled)
+                {
+                    source.Cancel();
+                }
+            }
+            NavManager.NavigateTo("/fetchdata");
+        } else
+        {
+            // source = new CancellationTokenSource();
+            // cTokenQr = source.Token;
+            // var user = await ts.CallQrGenerator(GenerateQR, cTokenQr, true);
+            // if (user != null)
+            // {
+            //     NavManager.NavigateTo("/fetchdata");
+            // }
+        }
+    }
+
+    private void GenerateQR(string data)
     {
-        if (Model.type == "ok") NavManager.NavigateTo("/fetchdata");
+        using (QRCodeGenerator qrGenerator = new QRCodeGenerator())
+        using (QRCodeData qrCodeData = qrGenerator.CreateQrCode(data, QRCodeGenerator.ECCLevel.Q))
+        using (PngByteQRCode qrCode = new PngByteQRCode(qrCodeData))
+        {
+            byte[] qrCodeImage = qrCode.GetGraphic(20);
+            imageString = Convert.ToBase64String(qrCodeImage);
+            StateHasChanged();
+        }
     }
 
     private async void Salir()
@@ -144,4 +193,15 @@
         await ts.logOff();
         NavManager.NavigateTo("/", true);
     }
+
+    public void Dispose()
+    {
+        if (source != null)
+        {
+            if (source.Token.CanBeCanceled)
+            {
+                source.Cancel();
+            }
+        }
+    }
 }
diff --git a/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor b/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
index f2914cf..1ed665b 100644
--- a/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
+++ b/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
@@ -35,7 +35,6 @@
     public string id { get; set; }
     [Parameter]
     public bool isShared { get; set; } = false;
-    [Inject] NavigationManager NavigationManager { get; set; } = null!;
 
     SfFileManager<FileManagerDirectoryContent>? FileManager;
 
@@ -95,14 +94,14 @@
     // {
     //     if (firstRender)
     //     {
-    //         var paramValue = getParamFromUrl("path", NavigationManager.Uri);
+    //         var paramValue = getParamFromUrl("path", MyNavigationManager.Uri);
 
     //         if (!string.IsNullOrEmpty(paramValue))
     //         {
     //             FileManager.Path = paramValue;
     //             // FileManager.RefreshFilesAsync();
     //         }
-    //         NavigationManager.LocationChanged += OnLocationChanged;
+    //         MyNavigationManager.LocationChanged += OnLocationChanged;
     //     }
     // }
 
@@ -111,7 +110,7 @@
     //     var route = getParamFromUrl(param, e.Location);
     //     if (route != FileManager.Path)
     //     {
-    //         var paramValue = getParamFromUrl(param, NavigationManager.Uri);
+    //         var paramValue = getParamFromUrl(param, MyNavigationManager.Uri);
 
     //         if (!string.IsNullOrEmpty(paramValue))
     //         {
@@ -123,7 +122,7 @@
 
     // private string getParamFromUrl(string param, string url)
     // {
-    //     var uri = NavigationManager.ToAbsoluteUri(url);
+    //     var uri = MyNavigationManager.ToAbsoluteUri(url);
     //     var queryParams = Microsoft.AspNetCore.WebUtilities.QueryHelpers.ParseQuery(uri.Query);
     //     if (queryParams.TryGetValue(param, out var paramValue))
     //     {
@@ -136,13 +135,13 @@
     // {
     //     try
     //     {
-    //         var paramValue = getParamFromUrl(param, NavigationManager.Uri);
+    //         var paramValue = getParamFromUrl(param, MyNavigationManager.Uri);
 
 
     //         if (string.IsNullOrEmpty(paramValue) || FileManager.Path != Uri.EscapeUriString(paramValue))
     //         {
-    //             var url = NavigationManager.Uri.Split('?')[0]; // Obtener la URL base sin parámetros
-    //             NavigationManager.NavigateTo($"{url}?path={FileManager.Path}", forceLoad: false, replace: false);
+    //             var url = MyNavigationManager.Uri.Split('?')[0]; // Obtener la URL base sin parámetros
+    //             MyNavigationManager.NavigateTo($"{url}?path={FileManager.Path}", forceLoad: false, replace: false);
     //         }
     //     }
     //     catch (Exception ex)
diff --git a/TelegramDownloader/Shared/NavMenu.razor b/TelegramDownloader/Shared/NavMenu.razor
index 9cf4c94..a6db720 100644
--- a/TelegramDownloader/Shared/NavMenu.razor
+++ b/TelegramDownloader/Shared/NavMenu.razor
@@ -124,8 +124,8 @@
                     <Content>
                         <div class="row">
                             <div class="btn-group" role="group" aria-label="Basic outlined example">
-                                <button class="btn btn-outline-warning" type="button" @onclick="HandleImportMenu"><i class="bi bi-cloud-upload"></i> Import</button>
-                                <button type="button" class="btn btn-outline-info"><i class="bi bi-grid-3x3-gap-fill"></i> List</button>
+                                <button class="btn btn-outline-light" type="button" @onclick="HandleImportMenu"><i class="bi bi-cloud-upload"></i> Import</button>
+                                <button type="button" class="btn btn-outline-light"><i class="bi bi-grid-3x3-gap-fill"></i> List</button>
                             </div>
                         </div>
                         @foreach (BsonSharedInfoModel sc in sharedChats)
diff --git a/TelegramDownloader/Shared/SurveyPrompt.razor b/TelegramDownloader/Shared/SurveyPrompt.razor
deleted file mode 100644
index e3e6429..0000000
--- a/TelegramDownloader/Shared/SurveyPrompt.razor
+++ /dev/null
@@ -1,16 +0,0 @@
-<div class="alert alert-secondary mt-4">
-    <span class="oi oi-pencil me-2" aria-hidden="true"></span>
-    <strong>@Title</strong>
-
-    <span class="text-nowrap">
-        Please take our
-        <a target="_blank" class="font-weight-bold link-dark" href="https://go.microsoft.com/fwlink/?linkid=2149017">brief survey</a>
-    </span>
-    and tell us what you think.
-</div>
-
-@code {
-    // Demonstrates how a parent component can supply parameters
-    [Parameter]
-    public string? Title { get; set; }
-}
diff --git a/TelegramDownloader/TelegramDownloader.csproj b/TelegramDownloader/TelegramDownloader.csproj
index 08a45d1..890f893 100644
--- a/TelegramDownloader/TelegramDownloader.csproj
+++ b/TelegramDownloader/TelegramDownloader.csproj
@@ -16,9 +16,10 @@
     <PackageReference Include="Blazor.Bootstrap" Version="3.1.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
     <PackageReference Include="MongoDB.Driver" Version="3.0.0" />
-    <PackageReference Include="Syncfusion.Blazor" Version="27.1.58" />
+    <PackageReference Include="QRCoder" Version="1.6.0" />
+    <PackageReference Include="Syncfusion.Blazor" Version="27.2.2" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="27.1.58" />
+    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="27.2.2" />
     <PackageReference Include="WTelegramClient" Version="4.2.2" />
   </ItemGroup>
 

From 44951f3593f7f6544cfe2c492e2c6c94063d79de Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Wed, 20 Nov 2024 17:57:30 +0100
Subject: [PATCH 04/32] feat: improve import shared files and folders

---
 .../Controllers/FileController.cs             |  1 +
 TelegramDownloader/Data/FileService.cs        | 28 ++++++++--
 TelegramDownloader/Data/ITelegramService.cs   |  4 ++
 TelegramDownloader/Data/TelegramService.cs    | 54 ++++++++++++++++++-
 TelegramDownloader/Models/ShareFilesModel.cs  | 15 ++++++
 .../Pages/Modals/ImportDataModal.razor        |  5 +-
 6 files changed, 101 insertions(+), 6 deletions(-)

diff --git a/TelegramDownloader/Controllers/FileController.cs b/TelegramDownloader/Controllers/FileController.cs
index 5771dea..e7ed55f 100644
--- a/TelegramDownloader/Controllers/FileController.cs
+++ b/TelegramDownloader/Controllers/FileController.cs
@@ -282,6 +282,7 @@ public async Task<IActionResult> ShareFiles(string id, string? bsonId, string? f
             sfm.id = id;
             sfm.name = fileName;
             sfm.fileName = fileName;
+            sfm.invitation = await _ts.getInvitationHash(Convert.ToInt64(id));
             sfm.files = await _fs.ShareFile(id, bsonId);
             var json = System.Text.Json.JsonSerializer.Serialize(sfm);
             var bytes = System.Text.Encoding.UTF8.GetBytes(json);
diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index 8a8ca34..69af078 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Components.Forms;
+using BlazorBootstrap;
+using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.StaticFiles;
 using Microsoft.Extensions.Logging;
 using MongoDB.Driver;
@@ -232,15 +233,17 @@ public class FileService : IFileService
         private IDbService _db { get; set; }
         private ILogger<IFileService> _logger { get; set; }
         private TransactionInfoService _tis { get; set; }
+        private ToastService _toastService { get; set;  }
 
         const int MaxSize = 1024 * 1024 * 1000; // 1GB 
 
 
-        public FileService(ITelegramService ts, IDbService db, ILogger<IFileService> logger, TransactionInfoService tis)
+        public FileService(ITelegramService ts, IDbService db, ILogger<IFileService> logger, TransactionInfoService tis, ToastService toastService)
         {
             _ts = ts;
             _db = db;
             _tis = tis;
+            _toastService = toastService;
             _logger = logger;
             createTempFolder();
         }
@@ -736,7 +739,13 @@ private async Task downloadFromTelegram(string dbName, int messageId, string des
             }
             model._transmitted = 0;
             model.callbacks = new Callbacks();
-            model.channelName = _ts.getChatName(Convert.ToInt64(dbName));
+            try
+            {
+                model.channelName = _ts.getChatName(Convert.ToInt64(dbName));
+            } catch(Exception ex) {
+                model.channelName = "Public or Shared";
+            }
+            
             model.callbacks.callback = async () => await DownloadFileNow(dbName, messageId, destPath, model);
             _tis.addToPendingDownloadList(model);
         }
@@ -831,6 +840,19 @@ public async Task importSharedData(ShareFilesModel sfm, GenericNotificationProgr
 
             try
             {
+                if (!_ts.isInChat(Convert.ToInt64(sfm.id)) && sfm.invitation != null && !string.IsNullOrEmpty(sfm.invitation.invitationHash))
+                    try
+                    {
+                        await _ts.joinChatInvitationHash(sfm.invitation.invitationHash);
+                        _toastService.Notify(new(ToastType.Success, "Join chat", $"Joined to chat"));
+                    }
+                    catch (Exception ex)
+                    {
+                        _toastService.Notify(new(ToastType.Danger, $"Error: {ex.Message}."));
+                    }
+                else
+                    _toastService.Notify(new(ToastType.Info, "You were already joined the chat"));
+                    
                 BsonSharedInfoModel bsi = new BsonSharedInfoModel();
                 bsi.ChannelId = sfm.id;
                 bsi.Name = sfm.name;
diff --git a/TelegramDownloader/Data/ITelegramService.cs b/TelegramDownloader/Data/ITelegramService.cs
index 395f3a3..a0d6cba 100644
--- a/TelegramDownloader/Data/ITelegramService.cs
+++ b/TelegramDownloader/Data/ITelegramService.cs
@@ -1,5 +1,6 @@
 using TelegramDownloader.Models;
 using TL;
+using WTelegram;
 
 namespace TelegramDownloader.Data
 {
@@ -10,6 +11,9 @@ public interface ITelegramService
         bool checkChannelExist(string id);
         bool checkUserLogin();
         Task deleteFile(string chatId, int idMessage);
+        bool isInChat(long id);
+        Task<InvitationInfo?> getInvitationHash(long id);
+        Task joinChatInvitationHash(string? hash);
         Task<User> CallQrGenerator(Action<string> func, CancellationToken ct, bool logoutFirst = false);
         Task<string> DownloadFile(ChatMessages message, string fileName = null, string folder = null, DownloadModel model = null);
         Task<Stream> DownloadFileAndReturn(ChatMessages message, Stream ms = null, string fileName = null, string folder = null, DownloadModel model = null);
diff --git a/TelegramDownloader/Data/TelegramService.cs b/TelegramDownloader/Data/TelegramService.cs
index d0efe00..a3ba85e 100644
--- a/TelegramDownloader/Data/TelegramService.cs
+++ b/TelegramDownloader/Data/TelegramService.cs
@@ -44,7 +44,13 @@ private void createDownloadFolder()
         private void newClient()
         {
             client = new WTelegram.Client(Convert.ToInt32(GeneralConfigStatic.tlconfig?.api_id ?? Environment.GetEnvironmentVariable("api_id")), GeneralConfigStatic.tlconfig?.hash_id ?? Environment.GetEnvironmentVariable("hash_id"), UserService.USERDATAFOLDER + "/WTelegram.session");
-            WTelegram.Helpers.Log = (lvl, str) => { }; // WTelegram.Helpers.Log = (lvl, str) => WTelegramLogs.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss} [{"TDIWE!"[lvl]}] {str}");
+            if (GeneralConfigStatic.config.ShouldShowLogInTerminal)
+            {
+                // WTelegram.Helpers.Log = (lvl, str) => Console.WriteLine($"{DateTime.Now:yyyy-MM-dd HH:mm:ss} [{"TDIWE!"[lvl]}] {str}");
+            } else
+            {
+                WTelegram.Helpers.Log = (lvl, str) => { };
+            }
 
         }
 
@@ -168,6 +174,52 @@ public async Task logOff()
             client.Dispose();
             newClient();
         }
+
+        public async Task<InvitationInfo?> getInvitationHash(long id)
+        {
+            var peer = chats.chats[id];
+            var invites = await client.Messages_GetExportedChatInvites(peer, client.User);
+            if (invites != null && invites.invites.Count() > 0)
+            {
+                
+                if (invites.invites.FirstOrDefault() is ChatInviteExported invi)
+                {
+                    return buildInvitationInfo(invi);
+                }
+            }
+            var invitation = await client.Messages_ExportChatInvite(peer);
+            if(invitation is ChatInviteExported inv)
+            {
+                return buildInvitationInfo(inv);
+            }
+            return null;
+        }
+
+        private InvitationInfo buildInvitationInfo(ChatInviteExported invi)
+        {
+            var hash = invi.link.Split("/").LastOrDefault();
+            if (hash[0] == '+')
+                return new InvitationInfo(hash.Substring(1), invi.link);
+            return new InvitationInfo(hash, invi.link);
+        }
+
+        public async Task joinChatInvitationHash(string? hash)
+        {
+            await client.Messages_ImportChatInvite(hash);
+        }
+
+        public bool isInChat(long id)
+        {
+            try
+            {
+                var _chat = chats.chats[id];
+                return true;
+            } catch(Exception)
+            {
+                return false;
+            }
+        }
+
         public string getChatName(long id)
         {
             List<ChatMessages> cm = new List<ChatMessages>();
diff --git a/TelegramDownloader/Models/ShareFilesModel.cs b/TelegramDownloader/Models/ShareFilesModel.cs
index a2becd3..ca025b3 100644
--- a/TelegramDownloader/Models/ShareFilesModel.cs
+++ b/TelegramDownloader/Models/ShareFilesModel.cs
@@ -10,8 +10,10 @@ public class ShareFilesModel
         public string id {  get; set; }
         [MaxLength(40)]
         public string name { get; set; }
+        public string chatName { get; set; }
         public string fileName { get; set; }
         public string description { get; set; }
+        public InvitationInfo? invitation { get; set; }
         public List<BsonFileManagerModel> files { get; set; }
     }
 
@@ -31,4 +33,17 @@ public class BsonSharedInfoModel
         public string Description { get; set; }
 
     }
+
+    public class InvitationInfo
+    {
+        public string? invitationHash { get; set; }
+        public string? invitationLink { get; set; }
+
+        public InvitationInfo() { }
+        public InvitationInfo(string? invitationHash, string? invitationLink)
+        {
+            this.invitationHash = invitationHash;
+            this.invitationLink = invitationLink;
+        }
+    }
 }
diff --git a/TelegramDownloader/Pages/Modals/ImportDataModal.razor b/TelegramDownloader/Pages/Modals/ImportDataModal.razor
index 82e9d5c..fb67ff4 100644
--- a/TelegramDownloader/Pages/Modals/ImportDataModal.razor
+++ b/TelegramDownloader/Pages/Modals/ImportDataModal.razor
@@ -1,7 +1,8 @@
 @using TelegramDownloader.Data
 @using TelegramDownloader.Models
-@inject ILogger<FileManager> Logger
-@inject IFileService fs
+@inject ILogger<FileManager> Logger;
+@inject IFileService fs;
+@inject ToastService toastService;
 
 <div class="modal @ModalClass" tabindex="-1" role="dialog" style="display:@ModalDisplay;">
     <div class="modal-dialog modal-dialog-centered" role="document">

From 0e5ed547fcadbf15475c3b18bdb4c981cea26ddb Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Wed, 20 Nov 2024 18:04:32 +0100
Subject: [PATCH 05/32] fix: solve anonymous tab issue

---
 TelegramDownloader/Shared/NavMenu.razor | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/TelegramDownloader/Shared/NavMenu.razor b/TelegramDownloader/Shared/NavMenu.razor
index a6db720..6f5ba76 100644
--- a/TelegramDownloader/Shared/NavMenu.razor
+++ b/TelegramDownloader/Shared/NavMenu.razor
@@ -247,19 +247,30 @@
 
     private async Task OnTabShowingAsync(TabsEventArgs args)
     {
-        await ProtectedSessionStore.SetAsync("tabmenu", args.ActiveTabTitle);
+        try
+        {
+            await ProtectedSessionStore.SetAsync("tabmenu", args.ActiveTabTitle);
+        } catch(Exception) {}
     }
 
     private async Task getActiveTab()
     {
-        var tab = await ProtectedSessionStore.GetAsync<string>("tabmenu");
-        if (!tab.Success || string.IsNullOrEmpty(tab.Value))
+        try
         {
-            await tabs.ShowTabByNameAsync("Mine");
-        } else
+            var tab = await ProtectedSessionStore.GetAsync<string>("tabmenu");
+            if (!tab.Success || string.IsNullOrEmpty(tab.Value))
+            {
+                await tabs.ShowTabByNameAsync("Mine");
+            }
+            else
+            {
+                await tabs.ShowTabByNameAsync(tab.Value);
+            }
+        } catch(Exception)
         {
-            await tabs.ShowTabByNameAsync(tab.Value);
+            
         }
+        
     }
 
     private async Task removeShared(string id, string collecionId)

From 2075a6a1e1fe228620542b805b574e272c3ad093 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Thu, 21 Nov 2024 19:16:55 +0100
Subject: [PATCH 06/32] chore: avoid check certificate

---
 TelegramDownloader/Configuration/config.example.json | 3 ++-
 TelegramDownloader/Models/GeneralConfig.cs           | 1 +
 TelegramDownloader/Program.cs                        | 8 ++++++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/TelegramDownloader/Configuration/config.example.json b/TelegramDownloader/Configuration/config.example.json
index 37ed4fb..20f4672 100644
--- a/TelegramDownloader/Configuration/config.example.json
+++ b/TelegramDownloader/Configuration/config.example.json
@@ -2,5 +2,6 @@
 {
   "api_id": "",
   "hash_id": "",
-  "mongo_connection_string": ""
+  "mongo_connection_string": "",
+  "avoid_checking_certificate":  false
 }
\ No newline at end of file
diff --git a/TelegramDownloader/Models/GeneralConfig.cs b/TelegramDownloader/Models/GeneralConfig.cs
index d4ea8fa..dfd7b0f 100644
--- a/TelegramDownloader/Models/GeneralConfig.cs
+++ b/TelegramDownloader/Models/GeneralConfig.cs
@@ -81,5 +81,6 @@ public class TLConfig
         public string? api_id { get; set; }
         public string? hash_id { get; set;}
         public string? mongo_connection_string { get; set; }
+        public bool? avoid_checking_certificate { get; set; }
     }
 }
diff --git a/TelegramDownloader/Program.cs b/TelegramDownloader/Program.cs
index 78503c9..3740a1e 100644
--- a/TelegramDownloader/Program.cs
+++ b/TelegramDownloader/Program.cs
@@ -14,6 +14,7 @@
 using TelegramDownloader.Models;
 using TelegramDownloader.Services.GitHub;
 using System.Net.Http;
+using System.Net;
 
 var extensionProvider = new FileExtensionContentTypeProvider();
 foreach(var mime in FileService.MIMETypesDictionary)
@@ -23,6 +24,13 @@
 
 GeneralConfigStatic.loadDbConfig();
 
+if (GeneralConfigStatic.tlconfig?.avoid_checking_certificate != null || Environment.GetEnvironmentVariable("avoid_checking_certificate") != null)
+    if (GeneralConfigStatic.tlconfig?.avoid_checking_certificate ?? Convert.ToBoolean(Environment.GetEnvironmentVariable("avoid_checking_certificate")))
+        ServicePointManager.ServerCertificateValidationCallback +=
+            (sender, certificate, chain, errors) => {
+                return true;
+            };
+
 
 var builder = WebApplication.CreateBuilder(args);
 Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("Ngo9BigBOggjHTQxAR8/V1NDaF5cWWtCf1FpRmJGdld5fUVHYVZUTXxaS00DNHVRdkdnWXZccXRQR2FZVEVzWUQ=");

From 19eac3340c74e1c897970d57b02e9873ed968db1 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Mon, 25 Nov 2024 18:39:57 +0100
Subject: [PATCH 07/32] chore: avoid add bad files and folders to upload

---
 TelegramDownloader/Data/FileService.cs | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index 69af078..d88fa63 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -1031,14 +1031,19 @@ public async Task AddUploadFileFromServer(string dbName, string currentPath, Lis
                 var fileInfo = new System.IO.FileInfo(currentFilePath);
                 if (!file.IsFile)
                 {
+                    if (file.Name == "@eaDir") continue;
                     var allFiles = new DirectoryInfo(currentFilePath).GetFiles("*.*", SearchOption.AllDirectories).Where(x => !x.Attributes.HasFlag(FileAttributes.Hidden));
                     idt.total += allFiles.Count();
                     idt.totalSize += allFiles.Sum(x => x.Length);
                 }
                 else
                 {
-                    idt.total++;
-                    idt.totalSize += fileInfo.Length;
+                    if (file.Size > 0)
+                    {
+                        idt.total++;
+                        idt.totalSize += fileInfo.Length;
+                    }
+                    
                 }
 
             }

From 909bf1ef1b50fc419c4ca2227bb2e94a3407e40a Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Mon, 25 Nov 2024 18:49:13 +0100
Subject: [PATCH 08/32] chore: improve count files on upload

---
 TelegramDownloader/Data/FileService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index d88fa63..7d829f5 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -1032,7 +1032,7 @@ public async Task AddUploadFileFromServer(string dbName, string currentPath, Lis
                 if (!file.IsFile)
                 {
                     if (file.Name == "@eaDir") continue;
-                    var allFiles = new DirectoryInfo(currentFilePath).GetFiles("*.*", SearchOption.AllDirectories).Where(x => !x.Attributes.HasFlag(FileAttributes.Hidden));
+                    var allFiles = new DirectoryInfo(currentFilePath).GetFiles("*.*", SearchOption.AllDirectories).Where(x => !x.Attributes.HasFlag(FileAttributes.Hidden) && x.Name != "@eaDir" && x.Length > 0);
                     idt.total += allFiles.Count();
                     idt.totalSize += allFiles.Sum(x => x.Length);
                 }

From 03673682f0ccbada4c832f40ca5ba34f8eb42605 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Mon, 25 Nov 2024 18:56:05 +0100
Subject: [PATCH 09/32] chore: avoid directories

---
 TelegramDownloader/Data/FileService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index 7d829f5..656acce 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -1032,7 +1032,7 @@ public async Task AddUploadFileFromServer(string dbName, string currentPath, Lis
                 if (!file.IsFile)
                 {
                     if (file.Name == "@eaDir") continue;
-                    var allFiles = new DirectoryInfo(currentFilePath).GetFiles("*.*", SearchOption.AllDirectories).Where(x => !x.Attributes.HasFlag(FileAttributes.Hidden) && x.Name != "@eaDir" && x.Length > 0);
+                    var allFiles = new DirectoryInfo(currentFilePath).GetFiles("*.*", SearchOption.AllDirectories).Where(x => !x.Attributes.HasFlag(FileAttributes.Hidden) && !x.Attributes.HasFlag(FileAttributes.Directory) && x.Name != "@eaDir" && x.Length > 0);
                     idt.total += allFiles.Count();
                     idt.totalSize += allFiles.Sum(x => x.Length);
                 }

From 5edd79f8032b9bcb56a0e8a35c468f6ffd8b88c2 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Mon, 25 Nov 2024 20:39:22 +0100
Subject: [PATCH 10/32] chore: not contains no sincronized folders

---
 TelegramDownloader/Data/FileService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index 656acce..1779a72 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -1032,7 +1032,7 @@ public async Task AddUploadFileFromServer(string dbName, string currentPath, Lis
                 if (!file.IsFile)
                 {
                     if (file.Name == "@eaDir") continue;
-                    var allFiles = new DirectoryInfo(currentFilePath).GetFiles("*.*", SearchOption.AllDirectories).Where(x => !x.Attributes.HasFlag(FileAttributes.Hidden) && !x.Attributes.HasFlag(FileAttributes.Directory) && x.Name != "@eaDir" && x.Length > 0);
+                    var allFiles = new DirectoryInfo(currentFilePath).GetFiles("*.*", SearchOption.AllDirectories).Where(x => !x.Attributes.HasFlag(FileAttributes.Hidden) && !x.Attributes.HasFlag(FileAttributes.Directory) && !x.FullName.Contains("@eaDir") && x.Length > 0);
                     idt.total += allFiles.Count();
                     idt.totalSize += allFiles.Sum(x => x.Length);
                 }

From 94113729b74884f8955a60e47432468bfd5a8995 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Tue, 26 Nov 2024 00:40:19 +0100
Subject: [PATCH 11/32] feat: video first step

---
 .../Pages/Modals/VideoPlayerModal.razor       | 44 +++++++++++++++++++
 .../Partials/impl/LocalFileManagerImpl.razor  | 15 ++++++-
 TelegramDownloader/Pages/_Layout.cshtml       |  6 +--
 3 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 TelegramDownloader/Pages/Modals/VideoPlayerModal.razor

diff --git a/TelegramDownloader/Pages/Modals/VideoPlayerModal.razor b/TelegramDownloader/Pages/Modals/VideoPlayerModal.razor
new file mode 100644
index 0000000..3313a70
--- /dev/null
+++ b/TelegramDownloader/Pages/Modals/VideoPlayerModal.razor
@@ -0,0 +1,44 @@
+<Modal @ref="modal" Title="Video" UseStaticBackdrop="true" CloseOnEscape="false">
+    <BodyTemplate>
+        @if(!string.IsNullOrEmpty(fileUrl))
+        {
+            <video id="video-player"
+                   class="video-js"
+                   controls
+                   preload="auto"
+                   width="100%"
+                   height="100%"
+                   data-setup="{}">
+                <source src=@fileUrl type="video/mp4" />
+                <p class="vjs-no-js">
+                    To view this video please enable JavaScript, and consider upgrading to a
+                    web browser that
+                    <a href="https://videojs.com/html5-video-support/" target="_blank">supports HTML5 video</a>
+                </p>
+            </video>
+        }
+        
+    </BodyTemplate>
+    <FooterTemplate>
+        <Button Color="ButtonColor.Secondary" @onclick="OnHideModalClick">Close</Button>
+    </FooterTemplate>
+</Modal>
+
+
+@code {
+    public string fileUrl = "";
+
+    private Modal modal = default!;
+
+    public async Task ShowModal(string file)
+    {
+        fileUrl = file;
+        await modal.ShowAsync();
+    }
+
+    public async Task OnHideModalClick()
+    {
+        fileUrl = "";
+        await modal.HideAsync();
+    }
+}
diff --git a/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor b/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
index 1ed665b..263b347 100644
--- a/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
+++ b/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
@@ -10,6 +10,7 @@
 @inject ILogger<FileManager> Logger;
 
 
+
 <SfFileManager @ref="FileManager" ID="localfm" TValue="FileManagerDirectoryContent">
     <FileManagerAjaxSettings Url=@($"/api/file/FileOperations")
                              UploadUrl="/api/file/Upload"
@@ -27,6 +28,7 @@
 <TelegramDownloader.Pages.Modals.UploadToTelegramModal @ref="Modal"></TelegramDownloader.Pages.Modals.UploadToTelegramModal>
 <TelegramDownloader.Pages.Modals.FileUploadModal @ref="ModalUpSer"></TelegramDownloader.Pages.Modals.FileUploadModal>
 <TelegramDownloader.Pages.Modals.InfoModals.MediaUrlModal @ref="mediaUrlModal"></TelegramDownloader.Pages.Modals.InfoModals.MediaUrlModal>
+<TelegramDownloader.Pages.Modals.VideoPlayerModal @ref=videoPlayer></TelegramDownloader.Pages.Modals.VideoPlayerModal>
 
 
 @code {
@@ -39,6 +41,7 @@
     SfFileManager<FileManagerDirectoryContent>? FileManager;
 
     private MediaUrlModal mediaUrlModal { get; set; } = default!;
+    private VideoPlayerModal videoPlayer { get; set; } = default!;
 
     NotificationModel nm = new NotificationModel();
     public string[] ContextItems = new string[] { "Open", "Delete", "Download", "Rename", "Details", "Copy Media Url" };
@@ -72,7 +75,7 @@
             Items.AddRange(new List<ToolBarItemModel>(){
                     new ToolBarItemModel() { Name = "Upload File", Text = "Upload To Server", TooltipText = "Upload To server", PrefixIcon = "e-icons e-fe-upload" },
                     new ToolBarItemModel() { Name = "UploadTelegram", Text = "Upload Telegram", TooltipText = "Upload File", PrefixIcon = "bi bi-telegram" },
-                    
+
                 }
             );
         }
@@ -176,7 +179,17 @@
             // string localdir = "/" + FileService.STATICRELATIVELOCALDIR.Replace("\\", "/");
             // string path = Path.Combine(localdir, args.FileDetails.FilterPath.Substring(1).Replace("\\", "/"), args.FileDetails.Name);
             // await JSRuntime.InvokeVoidAsync("open", path, "_blank");
+        } else
+        {
+            if (args != null && args.FileDetails != null && args.FileDetails.IsFile && new List<string> { ".mp4", ".avi", ".wmv", ".mkv", ".mov" }.Contains(args.FileDetails.Type.ToLower()))
+            {
+                string localdir = MyNavigationManager.BaseUri + FileService.STATICRELATIVELOCALDIR.Replace("\\", "/");
+                string path = new System.Uri((Path.Combine(localdir, args.FileDetails.FilterPath.Substring(1).Replace("\\", "/"), args.FileDetails.Name)).Replace("\\", "/")).AbsoluteUri;
+                videoPlayer.ShowModal(path);
+            }
+            
         }
+
     }
 
     private async Task playAudio(FileOpenEventArgs<FileManagerDirectoryContent> args)
diff --git a/TelegramDownloader/Pages/_Layout.cshtml b/TelegramDownloader/Pages/_Layout.cshtml
index 4944303..b815aaf 100644
--- a/TelegramDownloader/Pages/_Layout.cshtml
+++ b/TelegramDownloader/Pages/_Layout.cshtml
@@ -19,11 +19,8 @@
         <script src="https://cdn.syncfusion.com/blazor/25.1.35/syncfusion-blazor.min.js" type="text/javascript"></script>
     <link rel="stylesheet" href=" _content/Syncfusion.Blazor/styles/bootstrap5.css" />
     <script src="https://unpkg.com/vue@3/dist/vue.global.js"></script>
-    
+    <link href="https://vjs.zencdn.net/8.16.1/video-js.css" rel="stylesheet" />
 
-    
-    
-    
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
 </head>
 <body>
@@ -57,6 +54,7 @@
     <script src="js/bootstrap5/popper.min.js"></script>
 
     <script src="js/bshelp.js"></script>
+    <script src="https://vjs.zencdn.net/8.16.1/video.min.js"></script>
 
 
 </body>

From 78a4e20a0ac2c07353f7186e3e89ee7c648f8eeb Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Tue, 26 Nov 2024 19:22:06 +0100
Subject: [PATCH 12/32] chore: web video player

---
 TelegramDownloader/Pages/Modals/VideoPlayerModal.razor       | 5 ++---
 .../Pages/Partials/impl/LocalFileManagerImpl.razor           | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/TelegramDownloader/Pages/Modals/VideoPlayerModal.razor b/TelegramDownloader/Pages/Modals/VideoPlayerModal.razor
index 3313a70..cb142fa 100644
--- a/TelegramDownloader/Pages/Modals/VideoPlayerModal.razor
+++ b/TelegramDownloader/Pages/Modals/VideoPlayerModal.razor
@@ -1,4 +1,4 @@
-<Modal @ref="modal" Title="Video" UseStaticBackdrop="true" CloseOnEscape="false">
+<Modal @ref="modal" Title="Video" UseStaticBackdrop="true" CloseOnEscape="false" Size="ModalSize.ExtraLarge">
     <BodyTemplate>
         @if(!string.IsNullOrEmpty(fileUrl))
         {
@@ -6,8 +6,7 @@
                    class="video-js"
                    controls
                    preload="auto"
-                   width="100%"
-                   height="100%"
+                   style="height: 100% !important; width: 100% !important"
                    data-setup="{}">
                 <source src=@fileUrl type="video/mp4" />
                 <p class="vjs-no-js">
diff --git a/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor b/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
index 263b347..ba1d19c 100644
--- a/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
+++ b/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
@@ -181,7 +181,7 @@
             // await JSRuntime.InvokeVoidAsync("open", path, "_blank");
         } else
         {
-            if (args != null && args.FileDetails != null && args.FileDetails.IsFile && new List<string> { ".mp4", ".avi", ".wmv", ".mkv", ".mov" }.Contains(args.FileDetails.Type.ToLower()))
+            if (args != null && args.FileDetails != null && args.FileDetails.IsFile && new List<string> { ".mov", ".mp4", ".m4v", ".ogv", ".webm", ".flv", ".f4v" }.Contains(args.FileDetails.Type.ToLower()))
             {
                 string localdir = MyNavigationManager.BaseUri + FileService.STATICRELATIVELOCALDIR.Replace("\\", "/");
                 string path = new System.Uri((Path.Combine(localdir, args.FileDetails.FilterPath.Substring(1).Replace("\\", "/"), args.FileDetails.Name)).Replace("\\", "/")).AbsoluteUri;

From f60078b3a16ed7a6f6d866220bad0e6c5e585821 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Sun, 1 Dec 2024 13:20:07 +0100
Subject: [PATCH 13/32] feat: bump to dot net 8

---
 TelegramDownloader/Dockerfile                |  4 ++--
 TelegramDownloader/TelegramDownloader.csproj | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TelegramDownloader/Dockerfile b/TelegramDownloader/Dockerfile
index 2a10bcf..fca714e 100644
--- a/TelegramDownloader/Dockerfile
+++ b/TelegramDownloader/Dockerfile
@@ -1,11 +1,11 @@
 #See https://aka.ms/customizecontainer to learn how to customize your debug container and how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 ARG BUILD_CONFIGURATION=Release
 WORKDIR /src
 COPY ["TelegramDownloader.csproj", "."]
diff --git a/TelegramDownloader/TelegramDownloader.csproj b/TelegramDownloader/TelegramDownloader.csproj
index 890f893..6f49d2c 100644
--- a/TelegramDownloader/TelegramDownloader.csproj
+++ b/TelegramDownloader/TelegramDownloader.csproj
@@ -4,7 +4,7 @@
 	<Version>0.0.0.0</Version>
 	<Authors>Mateo</Authors>
 	<Product>TelegramFileManager</Product>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <UserSecretsId>528ba20b-8482-4c0f-9c2f-7ecc8dc30410</UserSecretsId>
@@ -13,14 +13,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazor.Bootstrap" Version="3.1.1" />
+    <PackageReference Include="Blazor.Bootstrap" Version="3.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
     <PackageReference Include="MongoDB.Driver" Version="3.0.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
-    <PackageReference Include="Syncfusion.Blazor" Version="27.2.2" />
+    <PackageReference Include="Syncfusion.Blazor" Version="27.2.4" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="27.2.2" />
-    <PackageReference Include="WTelegramClient" Version="4.2.2" />
+    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="27.2.4" />
+    <PackageReference Include="WTelegramClient" Version="4.2.4" />
   </ItemGroup>
 
   <ItemGroup>

From 8ee3095515d82356ebbd3efcb804c7b98723d5f6 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Sun, 1 Dec 2024 13:31:46 +0100
Subject: [PATCH 14/32] fix: fix docker port

---
 TelegramDownloader/Properties/launchSettings.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TelegramDownloader/Properties/launchSettings.json b/TelegramDownloader/Properties/launchSettings.json
index f3bab0d..e394367 100644
--- a/TelegramDownloader/Properties/launchSettings.json
+++ b/TelegramDownloader/Properties/launchSettings.json
@@ -21,7 +21,7 @@
       "launchBrowser": true,
       "launchUrl": "{Scheme}://{ServiceHost}:{ServicePort}",
       "environmentVariables": {
-        "ASPNETCORE_URLS": "https://+:443;http://+:80"
+        "ASPNETCORE_HTTP_PORTS": "https://+:443;http://+:80"
       },
       "publishAllPorts": true,
       "useSSL": true

From 17d177b441536a57a7c4a0a5b4f9cc22a800f2c1 Mon Sep 17 00:00:00 2001
From: mateof <mateof@gmail.com>
Date: Sun, 1 Dec 2024 13:40:45 +0100
Subject: [PATCH 15/32] Update README.md

---
 README.md | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6d7b48c..d4ad80f 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,7 @@ services:
     depends_on:
       - mongodb_container
     ports:
-      - "8015:80"
-      - "8016:443"
+      - "8015:8080"
     volumes:
       - <local folder/>:/app/local
       - <folder logs/>:/app/logs
@@ -99,6 +98,7 @@ services:
 - [Blazor Bootstrap](https://demos.blazorbootstrap.com/)
 - [WTelegramClient](https://github.com/wiz0u/WTelegramClient)
 
+<!---
 
 ## Name
 
@@ -120,8 +120,13 @@ services:
 
 ## Authors and acknowledgment
 
+-->
 
 ## License
 - GPLv3
 
+<!--
+
 ## Project status
+
+-->

From 6c8bb01cc43d0dee73289a41b5f0780eff665afb Mon Sep 17 00:00:00 2001
From: mateof <mateof@gmail.com>
Date: Sun, 1 Dec 2024 13:56:14 +0100
Subject: [PATCH 16/32] Update buildrelease.yml

Add .net library to compilation executable
---
 .github/workflows/buildrelease.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml
index 757a2f8..328007e 100644
--- a/.github/workflows/buildrelease.yml
+++ b/.github/workflows/buildrelease.yml
@@ -22,7 +22,7 @@ jobs:
                 TAG=${TAG:1}
                 echo "$TAG"
                 cd ${{github.workspace}}
-                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r win-x64 -c Release -o bin/win-x64 -p:PublishSingleFile=true,Version=$TAG --self-contained false
+                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r win-x64 -c Release -o bin/win-x64 -p:PublishSingleFile=true,Version=$TAG --self-contained
                 zip -r TelegramFileManager-${{github.event.release.tag_name}}-win-x64.zip bin/win-x64
                 gh release upload ${{github.event.release.tag_name}} TelegramFileManager-${{github.event.release.tag_name}}-win-x64.zip
             env:
@@ -34,7 +34,7 @@ jobs:
                 TAG=${{github.event.release.tag_name}}
                 TAG=${TAG:1}
                 cd ${{github.workspace}}
-                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r win-x86 -c Release -o bin/win-x86 -p:PublishSingleFile=true,Version=$TAG --self-contained false
+                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r win-x86 -c Release -o bin/win-x86 -p:PublishSingleFile=true,Version=$TAG --self-contained
                 zip -r TelegramFileManager-${{github.event.release.tag_name}}-win-x86.zip bin/win-x86
                 gh release upload ${{github.event.release.tag_name}} TelegramFileManager-${{github.event.release.tag_name}}-win-x86.zip
             env:
@@ -46,7 +46,7 @@ jobs:
                 TAG=${{github.event.release.tag_name}}
                 TAG=${TAG:1}
                 cd ${{github.workspace}}
-                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r win-arm64 -c Release -o bin/win-arm64 -p:PublishSingleFile=true,Version=$TAG --self-contained false
+                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r win-arm64 -c Release -o bin/win-arm64 -p:PublishSingleFile=true,Version=$TAG --self-contained
                 zip -r TelegramFileManager-${{github.event.release.tag_name}}-win-arm64.zip bin/win-arm64
                 gh release upload ${{github.event.release.tag_name}} TelegramFileManager-${{github.event.release.tag_name}}-win-arm64.zip
             env:
@@ -58,7 +58,7 @@ jobs:
                 TAG=${{github.event.release.tag_name}}
                 TAG=${TAG:1}
                 cd ${{github.workspace}}
-                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r linux-x64 -c Release -o bin/linux-x64 -p:PublishSingleFile=true,Version=$TAG --self-contained false
+                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r linux-x64 -c Release -o bin/linux-x64 -p:PublishSingleFile=true,Version=$TAG --self-contained
                 zip -r TelegramFileManager-${{github.event.release.tag_name}}-linux-x64.zip bin/linux-x64
                 gh release upload ${{github.event.release.tag_name}} TelegramFileManager-${{github.event.release.tag_name}}-linux-x64.zip
             env:
@@ -70,7 +70,7 @@ jobs:
                 TAG=${{github.event.release.tag_name}}
                 TAG=${TAG:1}
                 cd ${{github.workspace}}
-                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r linux-arm -c Release -o bin/linux-arm -p:PublishSingleFile=true,Version=$TAG --self-contained false
+                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r linux-arm -c Release -o bin/linux-arm -p:PublishSingleFile=true,Version=$TAG --self-contained
                 zip -r TelegramFileManager-${{github.event.release.tag_name}}-linux-arm.zip bin/linux-arm
                 gh release upload ${{github.event.release.tag_name}} TelegramFileManager-${{github.event.release.tag_name}}-linux-arm.zip
             env:
@@ -82,7 +82,7 @@ jobs:
                 TAG=${{github.event.release.tag_name}}
                 TAG=${TAG:1}
                 cd ${{github.workspace}}
-                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r osx-x64 -c Release -o bin/osx-x64 -p:PublishSingleFile=true,Version=$TAG --self-contained false
+                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r osx-x64 -c Release -o bin/osx-x64 -p:PublishSingleFile=true,Version=$TAG --self-contained
                 zip -r TelegramFileManager-${{github.event.release.tag_name}}-osx-x64.zip bin/osx-x64
                 gh release upload ${{github.event.release.tag_name}} TelegramFileManager-${{github.event.release.tag_name}}-osx-x64.zip
             env:

From 6f2f07015e45395b7b53b1c014cbb9cd07c00b8d Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Fri, 6 Dec 2024 15:23:46 +0100
Subject: [PATCH 17/32] feat: download pending

---
 TelegramDownloader/Data/FileService.cs        | 29 ++++++++++++--
 TelegramDownloader/Data/IFileService.cs       |  1 +
 TelegramDownloader/Data/ITelegramService.cs   |  2 +-
 TelegramDownloader/Data/TelegramService.cs    |  5 ++-
 TelegramDownloader/Pages/Downloads.razor      | 14 ++++++-
 .../Pages/Modals/DownloadModal.razor          | 14 +++----
 .../Pages/Partials/DownloadsTable.razor       | 40 +++++++++++++------
 .../Pages/Partials/TasksTable.razor           |  2 +-
 .../Pages/Partials/UploadsTable.razor         |  2 +-
 .../Services/TransactionInfoService.cs        | 20 ++++++++--
 10 files changed, 96 insertions(+), 33 deletions(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index 1779a72..413f7af 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -10,6 +10,7 @@
 
 using Syncfusion.EJ2.FileManager.PhysicalFileProvider;
 using Syncfusion.EJ2.Linq;
+using Syncfusion.EJ2.Notifications;
 using System.Dynamic;
 using System.IO.Compression;
 using System.Security.Cryptography;
@@ -706,7 +707,7 @@ public async Task downloadFile(string dbName, List<FileManagerDirectoryContent>
 
         private async Task<MemoryStream> downloadFromTelegramAndReturn(string dbName, int messageId, string destPath, MemoryStream ms = null)
         {
-            Message m = await _ts.getMessageFile(dbName, messageId);
+            TL.Message m = await _ts.getMessageFile(dbName, messageId);
             ChatMessages cm = new ChatMessages();
             cm.message = m;
 
@@ -750,6 +751,28 @@ private async Task downloadFromTelegram(string dbName, int messageId, string des
             _tis.addToPendingDownloadList(model);
         }
 
+        public async Task DownloadFileFromChat(ChatMessages message, string fileName = null, string folder = null, DownloadModel model = null)
+        {
+            if (model == null)
+                model = new DownloadModel();
+            model.name = fileName;
+            if (message.message.media is MessageMediaDocument { document: Document document })
+            {
+                model._size = document.size;
+            }
+            if (message.user is Channel channel)
+            {
+                model.channelName = channel.Title;
+            }
+            model._transmitted = 0;
+            model.channel = message.user;
+            //model.channelName = message.user.;
+            model.callbacks = new Callbacks();
+
+            model.callbacks.callback = async () => await _ts.DownloadFile(message,fileName, folder, model);
+            _tis.addToPendingDownloadList(model);
+        }
+
         public async Task DownloadFileNow(string dbName, int messageId, string destPath, DownloadModel model)
         {
             TL.Message m = await _ts.getMessageFile(dbName, messageId);
@@ -1149,7 +1172,7 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                         _logger.LogInformation($"Calculating MD5 of file {currentFilePath}");
                         model.MD5Hash = GetMd5HashFromFile(currentFilePath);
                         _logger.LogInformation($"Calculated MD5 of file {currentFilePath}: {model.MD5Hash}");
-                        Message m = null;
+                        TL.Message m = null;
                         long max = (long)MaxSize * (long)TelegramService.splitSizeGB;
                         if (fileInfo.Length > max)
                         {
@@ -1398,7 +1421,7 @@ public async Task UploadFile(string dbName, string currentPath, UploadFiles file
 
                 BsonFileManagerModel model = new BsonFileManagerModel();
                 model.Size = file.File.Size;
-                Message m = null;
+                TL.Message m = null;
                 if (file.File.Size > MaxSize)
                 {
 
diff --git a/TelegramDownloader/Data/IFileService.cs b/TelegramDownloader/Data/IFileService.cs
index 7c8c406..faeda77 100644
--- a/TelegramDownloader/Data/IFileService.cs
+++ b/TelegramDownloader/Data/IFileService.cs
@@ -15,6 +15,7 @@ public interface IFileService
         Task DeleteShared(string id, string collectionId);
         Task downloadFile(string dbName, List<FileManagerDirectoryContent> files, string targetPath, string? collectionId = null, string? channelId = null);
         Task downloadFile(string dbName, string path, List<string> files, string targetPath, string? collectionId = null, string? channelId = null);
+        Task DownloadFileFromChat(ChatMessages message, string fileName = null, string folder = null, DownloadModel model = null);
         Task downloadFileToServer(string dbName, string path, string destPath);
         FileStream? ExistFileIntempFolder(string id);
         Task<MemoryStream> exportAllData(string dbName);
diff --git a/TelegramDownloader/Data/ITelegramService.cs b/TelegramDownloader/Data/ITelegramService.cs
index a0d6cba..4369224 100644
--- a/TelegramDownloader/Data/ITelegramService.cs
+++ b/TelegramDownloader/Data/ITelegramService.cs
@@ -15,7 +15,7 @@ public interface ITelegramService
         Task<InvitationInfo?> getInvitationHash(long id);
         Task joinChatInvitationHash(string? hash);
         Task<User> CallQrGenerator(Action<string> func, CancellationToken ct, bool logoutFirst = false);
-        Task<string> DownloadFile(ChatMessages message, string fileName = null, string folder = null, DownloadModel model = null);
+        Task<string> DownloadFile(ChatMessages message, string fileName = null, string folder = null, DownloadModel model = null, bool shouldAddToList = false);
         Task<Stream> DownloadFileAndReturn(ChatMessages message, Stream ms = null, string fileName = null, string folder = null, DownloadModel model = null);
         Task<List<ChatViewBase>> GetFouriteChannels(bool mustRefresh = true);
         Task AddFavouriteChannel(long id);
diff --git a/TelegramDownloader/Data/TelegramService.cs b/TelegramDownloader/Data/TelegramService.cs
index a3ba85e..0b2b3f7 100644
--- a/TelegramDownloader/Data/TelegramService.cs
+++ b/TelegramDownloader/Data/TelegramService.cs
@@ -432,7 +432,7 @@ public async Task<Stream> DownloadFileAndReturn(ChatMessages message, Stream ms
             return null;
         }
 
-        public async Task<string> DownloadFile(ChatMessages message, string fileName = null, string folder = null, DownloadModel model = null)
+        public async Task<string> DownloadFile(ChatMessages message, string fileName = null, string folder = null, DownloadModel model = null, bool shouldAddToList = false)
         {
             if (model == null)
                 model = new DownloadModel();
@@ -447,7 +447,8 @@ public async Task<string> DownloadFile(ChatMessages message, string fileName = n
                 var filename = fileName ?? document.Filename;
                 filename ??= $"{document.id}.{document.mime_type[(document.mime_type.IndexOf('/') + 1)..]}";
                 model.name = filename;
-                _tis.addToDownloadList(model);
+                if (shouldAddToList)
+                    _tis.addToDownloadList(model);
                 Console.WriteLine("Downloading " + filename);
                 // using var fileStream = File.Create(filename);
                 using var dest = new FileStream($"{Path.Combine(folder != null ? folder : Path.Combine(Environment.CurrentDirectory, "local", "temp"), filename)}", FileMode.Create, FileAccess.Write);
diff --git a/TelegramDownloader/Pages/Downloads.razor b/TelegramDownloader/Pages/Downloads.razor
index 4c69c0a..e13b021 100644
--- a/TelegramDownloader/Pages/Downloads.razor
+++ b/TelegramDownloader/Pages/Downloads.razor
@@ -32,7 +32,19 @@
                 </div>
                 
             </div>
-            <TelegramDownloader.Pages.Partials.DownloadsTable></TelegramDownloader.Pages.Partials.DownloadsTable>
+            <Tabs>
+                <Tab Title="Downloads">
+                    <Content>
+                        <TelegramDownloader.Pages.Partials.DownloadsTable isPending="false"></TelegramDownloader.Pages.Partials.DownloadsTable>
+                    </Content>
+                </Tab>
+                <Tab Title="Pending">
+                    <Content>
+                        <TelegramDownloader.Pages.Partials.DownloadsTable isPending="true"></TelegramDownloader.Pages.Partials.DownloadsTable>
+                    </Content>
+                </Tab>
+            </Tabs>
+            
         </Content>
     </Tab>
     <Tab Title="Uploads">
diff --git a/TelegramDownloader/Pages/Modals/DownloadModal.razor b/TelegramDownloader/Pages/Modals/DownloadModal.razor
index 7e2d738..38acf03 100644
--- a/TelegramDownloader/Pages/Modals/DownloadModal.razor
+++ b/TelegramDownloader/Pages/Modals/DownloadModal.razor
@@ -6,6 +6,7 @@
 
 
 @inject ITelegramService ts
+@inject IFileService fs
 
 <div class="modal @ModalClass" tabindex="-1" role="dialog" style="display:@ModalDisplay">
     <div class="modal-dialog" role="document">
@@ -31,10 +32,10 @@
                         </div>
                         <div>
                             <TelegramDownloader.Shared.Ddtree idTree="dmtree" 
-                                @ref="ddtree"></TelegramDownloader.Shared.Ddtree>
+                            @ref="ddtree"></TelegramDownloader.Shared.Ddtree>
                         </div>
-                        
-                        
+
+
 
                         <div class="form-floating mb-3">
                             <InputText type="text" class="form-control" id="floatingInput" @bind-Value="model!.newName" />
@@ -100,13 +101,8 @@
 
     private async void Submit()
     {
-        ts.DownloadFile(mc, model?.newName == "" ? null : model.newName, ddtree.selectedNode == null ? null : ddtree.selectedNode.FirstOrDefault());
+        fs.DownloadFileFromChat(mc, model?.newName == "" ? null : model.newName, ddtree.selectedNode == null ? null : ddtree.selectedNode.FirstOrDefault());
         Close();
-        // Model.type = await ts.checkAuth(Model.value, Model.type == "phone");
-        // Model.value = "";
-        // StateHasChanged();
-        // isLogin();
-        // Logger.LogInformation("Id = {Id}", Model?.Id);
     }
 }
 
diff --git a/TelegramDownloader/Pages/Partials/DownloadsTable.razor b/TelegramDownloader/Pages/Partials/DownloadsTable.razor
index 1104853..0a2beca 100644
--- a/TelegramDownloader/Pages/Partials/DownloadsTable.razor
+++ b/TelegramDownloader/Pages/Partials/DownloadsTable.razor
@@ -5,13 +5,13 @@
 @inject TransactionInfoService tis
 
 <Grid @ref="grid"
-      TItem="DownloadModel"
-      Class="table table-hover table-bordered table-striped"
-      DataProvider="UploadsDataProvider"
-      AllowFiltering="false"
-      AllowPaging="true"
-      AllowSorting="false"
-      Responsive="true">
+TItem="DownloadModel"
+Class="table table-hover table-bordered table-striped"
+DataProvider="DownloadsDataProvider"
+AllowFiltering="false"
+AllowPaging="true"
+AllowSorting="false"
+Responsive="true">
 
     <GridColumn TItem="DownloadModel" HeaderText="ID" PropertyName="id" SortString="id" SortKeySelector="item => item.id" FilterTextboxWidth="50" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center">
         @context.id
@@ -31,7 +31,7 @@
         @context._transmittedString of @context._sizeString
     </GridColumn>
     <GridColumn TItem="DownloadModel" HeaderText="Actions">
-        @if (context.state == StateTask.Working)
+        @if (context.state == StateTask.Working && !isPending)
         {
             <td><button class="btn btn-danger" @onclick="() => cancel(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Cancel task"><i class="bi bi-x"></i></button></td>
         }
@@ -40,7 +40,17 @@
         {
             <td>
                 <div class="btn-group" role="group">
-                    <button class="btn btn-info" @onclick="() => retry(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="retry task"><i class="bi bi-arrow-clockwise"></i></button>
+                    @if(!isPending) {
+                        <button class="btn btn-info" @onclick="() => retry(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="retry task"><i class="bi bi-arrow-clockwise"></i></button>
+                    }
+                    <button class="btn btn-danger" @onclick="() => deleteDownload(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="delete task"><i class="bi bi-trash"></i></button>
+                </div>
+            </td>
+        }
+        @if(isPending) 
+        {
+            <td>
+                <div class="btn-group" role="group">
                     <button class="btn btn-danger" @onclick="() => deleteDownload(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="delete task"><i class="bi bi-trash"></i></button>
                 </div>
             </td>
@@ -50,6 +60,8 @@
 </Grid>
 
 @code {
+    [Parameter]
+    public bool isPending { get; set; } = false;
     public static List<DownloadModel> ldm = new List<DownloadModel>();
     BlazorBootstrap.Grid<DownloadModel> grid = default!;
 
@@ -59,10 +71,10 @@
         TransactionInfoService.EventChanged += eventChangedNew;
     }
 
-    private async Task<GridDataProviderResult<DownloadModel>> UploadsDataProvider(GridDataProviderRequest<DownloadModel> request)
+    private async Task<GridDataProviderResult<DownloadModel>> DownloadsDataProvider(GridDataProviderRequest<DownloadModel> request)
     {
         await getDownloadModels(request.PageNumber - 1, request.PageSize, ldm.Count() == 0);
-        int totalUploads = tis.getTotalDownloads();
+        int totalUploads = tis.getTotalDownloads(isPending);
         return await Task.FromResult(new GridDataProviderResult<DownloadModel> { Data = ldm ?? new List<DownloadModel>(), TotalCount = totalUploads });//request.ApplyTo(uploads));
     }
 
@@ -82,6 +94,10 @@
 
     private async Task deleteDownload(DownloadModel um)
     {
+        if (isPending) {
+            tis.deletePendingDownloadInList(um);
+            return;
+        }
         tis.deleteDownloadInList(um);
     }
 
@@ -100,7 +116,7 @@
 
     private async Task getDownloadModels(int pageNumber, int pageSize, bool mustCallEnventHandler = false)
     {
-        ldm = tis.GetDownloadModels(pageNumber, pageSize);
+        ldm = tis.GetDownloadModels(pageNumber, pageSize, isPending);
         if (mustCallEnventHandler)
             checkNewEventsHandler();
     }
diff --git a/TelegramDownloader/Pages/Partials/TasksTable.razor b/TelegramDownloader/Pages/Partials/TasksTable.razor
index fb4bb12..9b4dca1 100644
--- a/TelegramDownloader/Pages/Partials/TasksTable.razor
+++ b/TelegramDownloader/Pages/Partials/TasksTable.razor
@@ -13,7 +13,7 @@
       AllowSorting="false"
       Responsive="true">
 
-    <GridColumn TItem="InfoDownloadTaksModel" HeaderText="ID" PropertyName="id" SortString="id" SortKeySelector="item => item.id" FilterTextboxWidth="50" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center">
+    <GridColumn TItem="InfoDownloadTaksModel" Class="d-none d-md-table-cell" HeaderText="ID" PropertyName="id" SortString="id" SortKeySelector="item => item.id" FilterTextboxWidth="50" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center">
         @context.id
     </GridColumn>
     <GridColumn TItem="InfoDownloadTaksModel" HeaderText="To" PropertyName="toPath" SortString="toPath" SortKeySelector="item => item.toPath" FilterTextboxWidth="50" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center">
diff --git a/TelegramDownloader/Pages/Partials/UploadsTable.razor b/TelegramDownloader/Pages/Partials/UploadsTable.razor
index a6ffe8a..e206f41 100644
--- a/TelegramDownloader/Pages/Partials/UploadsTable.razor
+++ b/TelegramDownloader/Pages/Partials/UploadsTable.razor
@@ -13,7 +13,7 @@
       AllowSorting="false"
       Responsive="true">
 
-    <GridColumn TItem="UploadModel" HeaderText="ID" PropertyName="id" SortString="id" SortKeySelector="item => item.id" FilterTextboxWidth="50" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center">
+    <GridColumn TItem="UploadModel" Class="d-none d-md-table-cell" HeaderText="ID" PropertyName="id" SortString="id" SortKeySelector="item => item.id" FilterTextboxWidth="50" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center">
         @context.id
     </GridColumn>
     <GridColumn TItem="UploadModel" HeaderText="File" PropertyName="name" SortString="name" SortKeySelector="item => item.name" FilterTextboxWidth="50" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center">
diff --git a/TelegramDownloader/Services/TransactionInfoService.cs b/TelegramDownloader/Services/TransactionInfoService.cs
index d72cea9..9ab9f99 100644
--- a/TelegramDownloader/Services/TransactionInfoService.cs
+++ b/TelegramDownloader/Services/TransactionInfoService.cs
@@ -119,16 +119,22 @@ public void addToInfoDownloadTaskList(InfoDownloadTaksModel infoDownloadModel)
         }
 
 
-        public List<DownloadModel> GetDownloadModels(int pageNumber, int pageSize)
+        public List<DownloadModel> GetDownloadModels(int pageNumber, int pageSize, bool isPending = false)
         {
+            if (isPending)
+            {
+                if (pendingDownloadModels.Count() == 0 || pendingDownloadModels.Count() < (pageNumber) * pageSize)
+                    return pendingDownloadModels;
+                return pendingDownloadModels.Skip(pageNumber * pageSize).Take(pageSize).ToList();
+            }
             if (downloadModels.Count() == 0 || downloadModels.Count() < (pageNumber) * pageSize)
                 return downloadModels;
             return downloadModels.Skip(pageNumber * pageSize).Take(pageSize).ToList(); //.GetRange(pageNumber * pageSize, pageSize);
         }
 
-        public int getTotalDownloads()
+        public int getTotalDownloads(bool isPending = false)
         {
-            return downloadModels.Count();
+            return isPending ? pendingDownloadModels.Count() : downloadModels.Count();
         }
 
         public List<UploadModel> GetUploadModels(int pageNumber, int pageSize)
@@ -151,6 +157,14 @@ public void deleteDownloadInList(DownloadModel downloadModel)
             EventChanged?.Invoke(this, new EventArgs());
         }
 
+        public void deletePendingDownloadInList(DownloadModel downloadModel)
+        {
+            PendingDownloadMutex.WaitOne();
+            pendingDownloadModels.Remove(downloadModel);
+            PendingDownloadMutex.ReleaseMutex();
+            EventChanged?.Invoke(this, new EventArgs());
+        }
+
         public void deleteInfoDownloadTaskFromList(InfoDownloadTaksModel idt)
         {
             PendingUploadInfoTaskMutex.WaitOne();

From 9d5fe1d511a9c40c708b680614da8962ddf2e2e4 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Fri, 27 Dec 2024 18:12:35 +0100
Subject: [PATCH 18/32] chore: update libraries

---
 TelegramDownloader/Controllers/FileController.cs | 2 +-
 TelegramDownloader/Controllers/TempController.cs | 2 +-
 TelegramDownloader/Program.cs                    | 2 +-
 TelegramDownloader/TelegramDownloader.csproj     | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/TelegramDownloader/Controllers/FileController.cs b/TelegramDownloader/Controllers/FileController.cs
index e7ed55f..9304351 100644
--- a/TelegramDownloader/Controllers/FileController.cs
+++ b/TelegramDownloader/Controllers/FileController.cs
@@ -208,7 +208,7 @@ public async Task<IActionResult> Upload([FromForm] string path, IFormFile file,
             this.operation.RootFolder(Path.Combine(basePath, root));
             FileManagerResponse uploadResponse;
 
-            uploadResponse = operation.Upload(Path.Combine(basePath, root, path), lfile, action, null);
+            uploadResponse = operation.Upload(Path.Combine(basePath, root, path), lfile, action, 0, null);
             if (uploadResponse.Error != null)
             {
                 Response.Clear();
diff --git a/TelegramDownloader/Controllers/TempController.cs b/TelegramDownloader/Controllers/TempController.cs
index 92f777e..c4dcb70 100644
--- a/TelegramDownloader/Controllers/TempController.cs
+++ b/TelegramDownloader/Controllers/TempController.cs
@@ -220,7 +220,7 @@ public async Task<IActionResult> Upload([FromForm] string path, IFormFile file,
             this.operation.RootFolder(Path.Combine(basePath, root, id.ToString()));
             FileManagerResponse uploadResponse;
 
-            uploadResponse = operation.Upload(Path.Combine(basePath, root, path), lfile, action, null);
+            uploadResponse = operation.Upload(Path.Combine(basePath, root, path), lfile, action, 0, null);
             if (uploadResponse.Error != null)
             {
                 Response.Clear();
diff --git a/TelegramDownloader/Program.cs b/TelegramDownloader/Program.cs
index 3740a1e..5ab0198 100644
--- a/TelegramDownloader/Program.cs
+++ b/TelegramDownloader/Program.cs
@@ -33,7 +33,7 @@
 
 
 var builder = WebApplication.CreateBuilder(args);
-Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("Ngo9BigBOggjHTQxAR8/V1NDaF5cWWtCf1FpRmJGdld5fUVHYVZUTXxaS00DNHVRdkdnWXZccXRQR2FZVEVzWUQ=");
+Syncfusion.Licensing.SyncfusionLicenseProvider.RegisterLicense("MzY0NjIwOUAzMjM4MmUzMDJlMzBZdngxNkEzSjRTQTczaDdlWkxEd1BIeUovNjh1eHByNEg5SkRVZ1lmWHc4PQ==");
 builder.Services.AddSyncfusionBlazor();
 
 if (!Directory.Exists(FileService.IMGDIR))
diff --git a/TelegramDownloader/TelegramDownloader.csproj b/TelegramDownloader/TelegramDownloader.csproj
index 6f49d2c..aa4645a 100644
--- a/TelegramDownloader/TelegramDownloader.csproj
+++ b/TelegramDownloader/TelegramDownloader.csproj
@@ -15,12 +15,12 @@
   <ItemGroup>
     <PackageReference Include="Blazor.Bootstrap" Version="3.2.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
-    <PackageReference Include="MongoDB.Driver" Version="3.0.0" />
+    <PackageReference Include="MongoDB.Driver" Version="3.1.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
-    <PackageReference Include="Syncfusion.Blazor" Version="27.2.4" />
+    <PackageReference Include="Syncfusion.Blazor" Version="28.1.36" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="27.2.4" />
-    <PackageReference Include="WTelegramClient" Version="4.2.4" />
+    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="28.1.36" />
+    <PackageReference Include="WTelegramClient" Version="4.2.5" />
   </ItemGroup>
 
   <ItemGroup>

From 29b4550d3a281309b5da97190f9cf73e2fe2f2d1 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Mon, 30 Dec 2024 23:38:56 +0100
Subject: [PATCH 19/32] bugfix: fix get log path in native apps

---
 TelegramDownloader/Pages/LogList.razor | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TelegramDownloader/Pages/LogList.razor b/TelegramDownloader/Pages/LogList.razor
index 2f65471..6cb22f6 100644
--- a/TelegramDownloader/Pages/LogList.razor
+++ b/TelegramDownloader/Pages/LogList.razor
@@ -57,7 +57,7 @@
     private FilesAndCount getLogs(int pageNumber, int pageSize)
     {
         FilesAndCount fac = new FilesAndCount();
-        List<string> totalLogs = Directory.GetFiles(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "logs")).ToList();
+        List<string> totalLogs = Directory.GetFiles(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) ?? AppDomain.CurrentDomain.BaseDirectory, "logs")).ToList();
         totalLogs.Reverse();
         fac.totalFiles = totalLogs.Count();
 

From c5728ecda10ecf2a50d16af31c829916d5f0d5cb Mon Sep 17 00:00:00 2001
From: mateof <mateof@gmail.com>
Date: Mon, 30 Dec 2024 23:52:55 +0100
Subject: [PATCH 20/32] Merge: Main into develop (#20)

* Develop (#18)

* chore: add dropdown button to channel name

* feat: deleting shared
feat: refresh after import
feat: remember tab

* chore: improves

* feat: improve import shared files and folders

* fix: solve anonymous tab issue

* chore: avoid check certificate

* chore: avoid add bad files and folders to upload

* chore: improve count files on upload

* chore: avoid directories

* chore: not contains no sincronized folders

* feat: video first step

* chore: web video player

* feat: bump to dot net 8

* fix: fix docker port

* Update README.md

* Update buildrelease.yml

Add .net library to compilation executable

* merge: Develop into main (#19)

* chore: add dropdown button to channel name

* feat: deleting shared
feat: refresh after import
feat: remember tab

* chore: improves

* feat: improve import shared files and folders

* fix: solve anonymous tab issue

* chore: avoid check certificate

* chore: avoid add bad files and folders to upload

* chore: improve count files on upload

* chore: avoid directories

* chore: not contains no sincronized folders

* feat: video first step

* chore: web video player

* feat: bump to dot net 8

* fix: fix docker port

* Update README.md

* Update buildrelease.yml

Add .net library to compilation executable

* feat: download pending

* chore: update libraries

* bugfix: fix get log path in native apps

From 9a181a3a39ca9617f356deb502e15957b1f7f59d Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Fri, 24 Jan 2025 00:01:11 +0100
Subject: [PATCH 21/32] Overwrite only new files when upload

---
 TelegramDownloader/Data/FileService.cs       | 68 +++++++++++++++++++-
 TelegramDownloader/TelegramDownloader.csproj |  6 +-
 2 files changed, 70 insertions(+), 4 deletions(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index 413f7af..c8fd983 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -382,6 +382,67 @@ public async Task<List<BsonFileManagerModel>> ShareFile(string dbName, string bs
             return await GetFilesPath(dbName, args.Path);
         }
 
+        private async Task itemDeleteAsync(string dbName, string filterPath, string name, string parentId, string path)
+        {
+
+            BsonFileManagerModel entry = await _db.getEntry(dbName, filterPath, name);
+            if (entry == null)
+                throw new Exception($"File {System.IO.Path.Combine(filterPath, name)} not found");
+            if (!entry.IsFile)
+            {
+                List<BsonFileManagerModel> allChilds = await _db.getAllChildFilesInDirectory(dbName, filterPath + name + "/");
+                foreach (BsonFileManagerModel child in allChilds)
+                {
+                    await _db.deleteEntry(dbName, child.Id);
+                    if (child.IsFile)
+                    {
+                        if (child.isSplit)
+                        {
+                            foreach (int id in child.ListMessageId)
+                            {
+                                if (!await _db.existItemByTelegramId(dbName, id))
+                                    await _ts.deleteFile(dbName, id);
+                            }
+                        }
+                        else
+                        {
+                            if (!await _db.existItemByTelegramId(dbName, (int)child.MessageId))
+                                await _ts.deleteFile(dbName, (int)child.MessageId);
+                        }
+                    }
+
+                    //if (item.IsFile)
+                    //    await _db.subBytesToFolder(dbName, item.ParentId, item.Size);
+                }
+                await _db.deleteEntry(dbName, entry.Id);
+                // await _db.subBytesToFolder(dbName, entry.ParentId, entry.Size);
+            }
+
+            if (entry.IsFile)
+            {
+                await _db.deleteEntry(dbName, entry.Id);
+                if (entry.isSplit)
+                {
+                    foreach (int id in entry.ListMessageId)
+                    {
+                        if (!await _db.existItemByTelegramId(dbName, id))
+                            await _ts.deleteFile(dbName, id);
+                    }
+                }
+                else
+                {
+                    if (!await _db.existItemByTelegramId(dbName, (int)entry.MessageId))
+                        await _ts.deleteFile(dbName, (int)entry.MessageId);
+                }
+            }
+
+
+
+            await _db.subBytesToFolder(dbName, entry.ParentId, entry.Size);
+
+            await _db.checkAndSetDirectoryHasChild(dbName, parentId);
+        }
+
         public async Task oneItemDeleteAsync(string dbName, Syncfusion.Blazor.FileManager.FileManagerDirectoryContent File)
         {
 
@@ -1163,11 +1224,16 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                             continue;
                         }
                         idt.currentUpload++;
-                        if (file.Size == 0 || (await _db.getFileByPath(dbName, System.IO.Path.Combine(currentPath, file.Name))) != null)
+                        BsonFileManagerModel savedFile = await _db.getFileByPath(dbName, System.IO.Path.Combine(currentPath, file.Name));
+                        if (file.Size == 0 || (savedFile != null && savedFile.DateModified < file.DateModified))
                         {
                             if (idt != null) idt.AddOne(file.Size);
                             continue;
                         };
+                        if (savedFile != null)
+                        {
+                            await itemDeleteAsync(dbName, savedFile.FilterPath, savedFile.Name, savedFile.ParentId, savedFile.FilePath);
+                        }
                         model.Size = fileInfo.Length;
                         _logger.LogInformation($"Calculating MD5 of file {currentFilePath}");
                         model.MD5Hash = GetMd5HashFromFile(currentFilePath);
diff --git a/TelegramDownloader/TelegramDownloader.csproj b/TelegramDownloader/TelegramDownloader.csproj
index aa4645a..6e6e020 100644
--- a/TelegramDownloader/TelegramDownloader.csproj
+++ b/TelegramDownloader/TelegramDownloader.csproj
@@ -17,10 +17,10 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
     <PackageReference Include="MongoDB.Driver" Version="3.1.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
-    <PackageReference Include="Syncfusion.Blazor" Version="28.1.36" />
+    <PackageReference Include="Syncfusion.Blazor" Version="28.1.41" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="28.1.36" />
-    <PackageReference Include="WTelegramClient" Version="4.2.5" />
+    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="28.1.41" />
+    <PackageReference Include="WTelegramClient" Version="4.2.8" />
   </ItemGroup>
 
   <ItemGroup>

From 6406c6accb9b619461d5d203f0ebf0e66fe7a9e7 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Fri, 24 Jan 2025 00:10:46 +0100
Subject: [PATCH 22/32] fix: fix date check

---
 TelegramDownloader/Data/FileService.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index c8fd983..2ebe4a5 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -1225,7 +1225,7 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                         }
                         idt.currentUpload++;
                         BsonFileManagerModel savedFile = await _db.getFileByPath(dbName, System.IO.Path.Combine(currentPath, file.Name));
-                        if (file.Size == 0 || (savedFile != null && savedFile.DateModified < file.DateModified))
+                        if (file.Size == 0 || (savedFile != null && savedFile.DateModified > file.DateModified))
                         {
                             if (idt != null) idt.AddOne(file.Size);
                             continue;

From 29e38467176f8ce82faff3f6892d2340d6b3a17b Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Thu, 6 Feb 2025 20:13:09 +0100
Subject: [PATCH 23/32] feat: add show all messages feat: change md5 to xxhash
 feat: add more info in upload table feat: allow disable hash calculator by
 config refactor: chatMessage

---
 TelegramDownloader/Data/FileService.cs        |  43 +++++-
 TelegramDownloader/Data/ITelegramService.cs   |   1 +
 TelegramDownloader/Data/TelegramService.cs    |  32 +++++
 TelegramDownloader/Models/DownloadModel.cs    |  15 +-
 TelegramDownloader/Models/FileModel.cs        |   1 +
 TelegramDownloader/Models/GeneralConfig.cs    |   1 +
 TelegramDownloader/Pages/Config.razor         |   9 ++
 TelegramDownloader/Pages/FetchData.razor      | 135 ++++++++----------
 .../InfoModals/UploadFileInfoModal.razor      |  38 +++++
 .../Pages/Partials/ChatMessage.razor          |  74 ++++++++++
 .../Pages/Partials/UploadsTable.razor         |  26 ++--
 .../Partials/impl/LocalFileManagerImpl.razor  |   4 +-
 TelegramDownloader/TelegramDownloader.csproj  |   7 +-
 13 files changed, 285 insertions(+), 101 deletions(-)
 create mode 100644 TelegramDownloader/Pages/Modals/InfoModals/UploadFileInfoModal.razor
 create mode 100644 TelegramDownloader/Pages/Partials/ChatMessage.razor

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index 2ebe4a5..d4c1869 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -12,7 +12,9 @@
 using Syncfusion.EJ2.Linq;
 using Syncfusion.EJ2.Notifications;
 using System.Dynamic;
+using System.IO;
 using System.IO.Compression;
+using System.IO.Hashing;
 using System.Security.Cryptography;
 using System.Text.Json;
 using System.Xml.Linq;
@@ -1230,14 +1232,13 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                             if (idt != null) idt.AddOne(file.Size);
                             continue;
                         };
-                        if (savedFile != null)
+                        model.Size = fileInfo.Length;
+                        if (GeneralConfigStatic.config.CheckHash)
                         {
-                            await itemDeleteAsync(dbName, savedFile.FilterPath, savedFile.Name, savedFile.ParentId, savedFile.FilePath);
+                            _logger.LogInformation($"Calculating HASH of file {currentFilePath}");
+                            model.XXHash = ComputeXXHash64(currentFilePath);
+                            _logger.LogInformation($"Calculated HASH of file {currentFilePath}: {model.XXHash}");
                         }
-                        model.Size = fileInfo.Length;
-                        _logger.LogInformation($"Calculating MD5 of file {currentFilePath}");
-                        model.MD5Hash = GetMd5HashFromFile(currentFilePath);
-                        _logger.LogInformation($"Calculated MD5 of file {currentFilePath}: {model.MD5Hash}");
                         TL.Message m = null;
                         long max = (long)MaxSize * (long)TelegramService.splitSizeGB;
                         if (fileInfo.Length > max)
@@ -1253,6 +1254,8 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                                 int attempts = 3;
                                 int waitForNextAttempt = 1000;
                                 UploadModel um = new UploadModel();
+                                um.path = currentFilePath;
+                                um.chatName = _ts.getChatName(Convert.ToInt64(dbName));
                                 // add upload to task list
                                 idt.addUpload(um);
                                 um.thread = Thread.CurrentThread;
@@ -1300,6 +1303,8 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                             int attempts = 3;
                             int waitForNextAttempt = 60000;
                             UploadModel um = new UploadModel();
+                            um.path = currentFilePath;
+                            um.chatName = _ts.getChatName(Convert.ToInt64(dbName));
                             // add upload to task list
                             idt.addUpload(um);
                             while (attempts != 0 || um.state == StateTask.Canceled)
@@ -1360,7 +1365,11 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
 
                             model.MessageId = m.ID;
                         }
-
+                        // delete previous file, when the new modified date file is newest
+                        if (savedFile != null)
+                        {
+                            await itemDeleteAsync(dbName, savedFile.FilterPath, savedFile.Name, savedFile.ParentId, savedFile.FilePath);
+                        }
                     }
                     BsonFileManagerModel parent = await _db.getParentDirectoryByPath(dbName, currentPath);
                     model.Name = file.IsFile ? fileInfo.Name : file.Name;
@@ -1766,6 +1775,26 @@ private string GetMd5HashFromFile(string filePath)
             }
         }
 
+        private string ComputeXXHash64(string filePath)
+        {
+            XxHashModel _xxHash = new XxHashModel();
+            _xxHash.path = filePath;
+            var hashAlgorithm = new XxHash64();
+            var buffer = new Span<byte>(new byte[512]);
+            using (Stream entryStream = File.OpenRead(filePath))
+            {
+                _tis.addToUploadList(_xxHash);
+                _xxHash.Init(entryStream.Length, Path.GetFileName(filePath));
+                while (entryStream.Read(buffer) > 0)
+                {
+                    hashAlgorithm.Append(buffer);
+                }
+            }
+
+            return BitConverter.ToString(hashAlgorithm.GetHashAndReset()).Replace("-", string.Empty);
+
+        }
+
         private async Task<List<Stream>> splitFileAsync(Stream s, int size)
         {
             List<Stream> ls = new List<Stream>();
diff --git a/TelegramDownloader/Data/ITelegramService.cs b/TelegramDownloader/Data/ITelegramService.cs
index 4369224..7b376fc 100644
--- a/TelegramDownloader/Data/ITelegramService.cs
+++ b/TelegramDownloader/Data/ITelegramService.cs
@@ -22,6 +22,7 @@ public interface ITelegramService
         Task RemoveFavouriteChannel(long id);
         Task<List<ChatViewBase>> getAllChats();
         Task<List<ChatViewBase>> getAllSavedChats();
+        Task<List<ChatMessages>> getAllMessages(long id);
         Task<List<ChatMessages>> getChatHistory(long id, int limit = 30, int addOffset = 0);
         string getChatName(long id);
         Task<Message> getMessageFile(string chatId, int idMessage);
diff --git a/TelegramDownloader/Data/TelegramService.cs b/TelegramDownloader/Data/TelegramService.cs
index 0b2b3f7..56e9079 100644
--- a/TelegramDownloader/Data/TelegramService.cs
+++ b/TelegramDownloader/Data/TelegramService.cs
@@ -316,6 +316,37 @@ public async Task<Message> getMessageFile(string chatId, int idMessage)
             //return m;
         }
 
+        public async Task<List<ChatMessages>> getAllMessages(long id)
+        {
+            List<ChatMessages> cm = new List<ChatMessages>();
+            InputPeer peer = chats.chats[id];
+            for (int offset_id = 0; ;)
+            {
+                var messages = await client.Messages_GetHistory(peer, offset_id);
+                if (messages.Messages.Length == 0) break;
+                foreach (MessageBase msgBase in messages.Messages)
+                {
+                    if (msgBase is Message msg)
+                    {
+                        ChatMessages cm2 = new ChatMessages();
+                        cm2.htmlMessage = client.EntitiesToHtml(msg.message, msg.entities);
+                        cm2.message = msg;
+
+                        cm2.user = messages.UserOrChat(msg.From ?? msg.Peer);
+                        cm2.isDocument = false;
+                        if (msg.media is MessageMediaDocument { document: Document document })
+                        {
+                            cm2.isDocument = true;
+                        }
+
+                        cm.Add(cm2);
+                    }
+                }
+                offset_id = messages.Messages[^1].ID;
+            }
+            return cm;
+        }
+
         public async Task<List<ChatMessages>> getChatHistory(long id, int limit = 30, int addOffset = 0)
         {
             List<ChatMessages> cm = new List<ChatMessages>();
@@ -478,5 +509,6 @@ public async Task<string> DownloadFile(ChatMessages message, string fileName = n
             }
             return null;
         }
+
     }
 }
diff --git a/TelegramDownloader/Models/DownloadModel.cs b/TelegramDownloader/Models/DownloadModel.cs
index 86ebb7f..08af6aa 100644
--- a/TelegramDownloader/Models/DownloadModel.cs
+++ b/TelegramDownloader/Models/DownloadModel.cs
@@ -199,13 +199,14 @@ public class UploadModel
         public StateTask state { get; set; } = StateTask.Working;
         public ChatMessages m { get; set; }
         public string name { get; set; }
+        public string path { get; set; }
 
         public long _size { get; set; }
         public long _transmitted { get; set; }
 
         public string _sizeString { get; set; }
         public string _transmittedString { get; set; }
-
+        public string chatName { get; set; }
         public IPeerInfo channel { get; set; }
         public int progress { get; set; }
         public Thread thread { get; set; }
@@ -280,14 +281,14 @@ public Md5Model() : base()
         {
             action = "MD5 Calc";
         }
-        public void Init(long size, string filename)
+        public virtual void Init(long size, string filename)
         {
             _sizeString = HelperService.SizeSuffix(size);
             name = filename;
             base.InvokeEvent(new UploadEventArgs());
         }
 
-        public void Finish()
+        public virtual void Finish()
         {
             state = StateTask.Completed;
             progress = 100;
@@ -295,6 +296,14 @@ public void Finish()
         }
     }
 
+    public class XxHashModel : Md5Model
+    {
+        public XxHashModel() : base()
+        {
+            action = "XxHash Calc";
+        }
+    }
+
     public class NewDownloadModel
     {
         public string newName { get; set; }
diff --git a/TelegramDownloader/Models/FileModel.cs b/TelegramDownloader/Models/FileModel.cs
index 47bc824..10f37b4 100644
--- a/TelegramDownloader/Models/FileModel.cs
+++ b/TelegramDownloader/Models/FileModel.cs
@@ -47,6 +47,7 @@ public class BsonFileManagerModel
         public List<int>? ListMessageId { get; set; }
         public bool isEncrypted { get; set; } = false;
         public string MD5Hash { get; set; }
+        public string XXHash { get; set; }
 
         public BsonFileManagerModel()
         {
diff --git a/TelegramDownloader/Models/GeneralConfig.cs b/TelegramDownloader/Models/GeneralConfig.cs
index dfd7b0f..c327c62 100644
--- a/TelegramDownloader/Models/GeneralConfig.cs
+++ b/TelegramDownloader/Models/GeneralConfig.cs
@@ -71,6 +71,7 @@ public class GeneralConfig
         public int TimeSleepBetweenTransactions { get; set; } = 2000;
         public int SplitSize { get; set; } = 0;
         public int MaxSimultaneousDownloads = 1;
+        public bool CheckHash { get; set; } = false;
         public bool ShouldShowLogInTerminal { get; set; } = false;
         public List<long> FavouriteChannels { get; set; } = new List<long>();
         
diff --git a/TelegramDownloader/Pages/Config.razor b/TelegramDownloader/Pages/Config.razor
index 03e1ac4..d06ad06 100644
--- a/TelegramDownloader/Pages/Config.razor
+++ b/TelegramDownloader/Pages/Config.razor
@@ -34,6 +34,15 @@
             </div>
         </div>
 
+        <div>
+            <div class="form-check form-switch">
+                <InputCheckbox @bind-Value="Model!.CheckHash" class="form-check-input" type="checkbox" id="CheckHash" />
+                <label class="form-check-label" for="ShouldShowNotifications">Check Hash</label>
+            </div>
+
+
+        </div>
+
         <div>
             <div class="form-check form-switch">
                 <InputCheckbox @bind-Value="Model!.ShouldNotify" class="form-check-input" type="checkbox" id="ShouldShowNotifications" />
diff --git a/TelegramDownloader/Pages/FetchData.razor b/TelegramDownloader/Pages/FetchData.razor
index 3c2cc5e..379c11d 100644
--- a/TelegramDownloader/Pages/FetchData.razor
+++ b/TelegramDownloader/Pages/FetchData.razor
@@ -5,8 +5,9 @@
 @using TelegramDownloader.Models
 @using TelegramDownloader.Services
 
-@inject ITelegramService ts
-@inject NavigationManager NavManager
+@inject ITelegramService ts;
+@inject NavigationManager NavManager;
+@inject PreloadService PreloadService;
 
 <PageTitle>Chat</PageTitle>
 
@@ -20,67 +21,22 @@ else
     <div>
         @if(m != null)
         {
+            <Switch @bind-Value="showAll" @ref="allMessageSwitch" @oninput="ShowAllChanged" Label="Show all messages" />
             @foreach (var mess in m)
             {
-                <div aria-live="polite" aria-atomic="true" class="bottom-0 start-0" style="padding-bottom: 10px;">
-                    <div class="toast-container position-static">
-                        <div class="toast" style="display: block !important; width: 600px;">
-                            <div class="toast-header">
-                                @* <img src="@(msg.media)" class="rounded me-2" alt="..."> *@
-                                <strong class="me-auto">@mess.user</strong>
-                                <small style="padding-right: 5px;">@mess.message.edit_date.ToShortDateString()</small>
-                                @if (mess.message.media is MessageMediaDocument { document: Document document })
-                                {
-                                    <span>@HelperService.SizeSuffix(document.size)</span>
-                                    <div class="dropdown">
-                                        <button class="btn" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                            <svg width="12" height="14" fill="currentColor" class="bi bi-three-dots-vertical" viewBox="0 0 16 16">
-                                                <path d="M9.5 13a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z" />
-                                            </svg>
-                                        </button>
-                                        <ul class="dropdown-menu">
-                                            <li><span class="dropdown-item" @onclick="() => Modal.Open(mess)">Download</span></li>
-                                            <li><span class="dropdown-item" @onclick="() => save(mess)">Download Now</span></li>
-                                        </ul>
-                                    </div>
-                                }
-                                
-                            </div>
-                            <div class="toast-body">
-                                <div>
-                                    <div>
-                                        @if (mess.message.media is MessageMediaDocument { document: Document document2 })
-                                        {
-                                            <span>@document2.Filename</span>
-                                        }
-                                    </div>
-                                    <div>
-                                        @if (mess.message.media is MessageMediaPhoto { photo: Photo photo })
-                                        {
-                                            <img alt="@photo.id" style="max-width:-webkit-fill-available;" src="/img/telegram/@($"{photo.id}.jpg")" />
-                                            
-                                        }
-                                    </div>
-                                    <div>
-                                        @* @{
-                                            Regex rrg = new Regex(@"(https?://[^\s]+)");
-                                        }
-                                        @((MarkupString)rrg.Replace(msg.message, "<a href=\"$1\">$1</a>").Replace("\n", "<br>")) *@
-                                        @((MarkupString)mess.htmlMessage.Replace("\n", "<br>"))
-                                    </div>
-                                    @* <div>@msg.media</div> *@
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                    
 
+                <TelegramDownloader.Pages.Partials.ChatMessage mess="@mess" modal="Modal" />
+
+            }
+            @if (!showAll)
+            {
+                <button type="button" class="btn btn-outline-secondary" @onclick="moreElements"> More elements </button>
             }
-            <button type="button" class="btn btn-outline-secondary" @onclick="moreElements"> More elements </button>
+            
         }
-        
+
     </div>
+    
     <TelegramDownloader.Pages.Modals.DownloadModal @ref="Modal"></TelegramDownloader.Pages.Modals.DownloadModal>
 }
 
@@ -95,10 +51,13 @@ else
 </script> *@
 
 @code {
+
     private Modals.DownloadModal Modal { get; set; }
     private string? idChat;
     private int elements = 20;
     private int page = 0;
+    bool showAll = false;
+    Switch allMessageSwitch { get; set; }
     [Parameter]
     public string? id {
         get => idChat;
@@ -111,55 +70,75 @@ else
             }
         }
     }
+
+
     private async Task<string> downloadPhoto(ChatMessages m)
     {
         return await ts.DownloadFile(m, idChat);
     }
+
     public List<ChatMessages> m = null;
 
-    //private WeatherForecast[]? forecasts;
+
+    private async Task ShowAllChanged(Microsoft.AspNetCore.Components.ChangeEventArgs args)
+    {
+        if (args.Value != null)
+            if ((bool) args.Value)
+            {
+                if (!String.IsNullOrEmpty(idChat))
+                {
+                    PreloadService.Show(SpinnerColor.Light, "Loading data...");
+                    m = await ts.getAllMessages(long.Parse(idChat));
+                    downloadPhotos(m);
+                    PreloadService.Hide();
+                    StateHasChanged();
+                }
+            } else 
+            {
+                await updateId(isRefresh: true);
+            }
+    }
 
     protected override async Task OnInitializedAsync()
     {
         if (!ts.checkUserLogin()) NavManager.NavigateTo("/");
-        // forecasts = await ForecastService.GetForecastAsync(DateTime.Now);
     }
 
-    private async Task updateId()
+    private async Task downloadPhotos(List<ChatMessages> m)
     {
-        page = 0;
-        if (!String.IsNullOrEmpty(idChat))
+        foreach (ChatMessages mess in m)
         {
-            List<ChatMessages> mb = await ts.getChatHistory(long.Parse(idChat), limit: elements, addOffset: elements * page);
-            m = mb;
-            foreach(ChatMessages mess in m)
+            if (mess.message.media is MessageMediaPhoto { photo: Photo photo })
             {
-                if (mess.message.media is MessageMediaPhoto { photo: Photo photo })
-                {
-                    await downloadPhoto(mess);
-                }
+                await downloadPhoto(mess);
             }
-            page += 1;
-            StateHasChanged();
+        }
+    }
+
+    private async Task updateId(bool isRefresh = false)
+    {
+        if (!isRefresh)
+            showAll = false;
+        page = 0;
+        if (!String.IsNullOrEmpty(idChat))
+        {
+            m = new List<ChatMessages>();
+            await moreElements();
         }
     }
 
     private async Task moreElements()
     {
+        PreloadService.Show(SpinnerColor.Light, "Loading data...");
         if (!String.IsNullOrEmpty(idChat))
         {
             List<ChatMessages> mb = await ts.getChatHistory(long.Parse(idChat), limit: elements, addOffset: elements * page);
             m.AddRange(mb);
-            foreach (ChatMessages mess in mb)
-            {
-                if (mess.message.media is MessageMediaPhoto { photo: Photo photo })
-                {
-                    await downloadPhoto(mess);
-                }
-            }
+            downloadPhotos(page > 0 ? mb : m);
             page += 1;
             StateHasChanged();
         }
+        PreloadService.Hide();
     }
 
     public async Task save(ChatMessages cm)
diff --git a/TelegramDownloader/Pages/Modals/InfoModals/UploadFileInfoModal.razor b/TelegramDownloader/Pages/Modals/InfoModals/UploadFileInfoModal.razor
new file mode 100644
index 0000000..27e2bae
--- /dev/null
+++ b/TelegramDownloader/Pages/Modals/InfoModals/UploadFileInfoModal.razor
@@ -0,0 +1,38 @@
+@using TelegramDownloader.Models
+
+<Modal @ref="Modal" title="File Info" Size="ModalSize.ExtraLarge">
+    <BodyTemplate>
+        <table class="table">
+            <tbody>
+                <tr>
+                    <td>Path</td>
+                    <td>@uploadModel.path</td>
+                </tr>
+                <tr>
+                    <td>Channel</td>
+                    <td>@uploadModel.chatName</td>
+                </tr>
+                <tr>
+                    <td>Size</td>
+                    <td>@uploadModel._sizeString</td>
+                </tr>
+            </tbody>
+        </table>
+    </BodyTemplate>
+</Modal>
+
+@code {
+    [Parameter]
+    public UploadModel uploadModel { get; set; }
+    private Modal Modal = default!;
+
+    public async Task ShowModal(UploadModel uploadModel)
+    {
+        this.uploadModel = uploadModel;
+        if (this.uploadModel != null)
+        {
+            await Modal.ShowAsync();
+        }
+        
+    }
+}
diff --git a/TelegramDownloader/Pages/Partials/ChatMessage.razor b/TelegramDownloader/Pages/Partials/ChatMessage.razor
new file mode 100644
index 0000000..f3729bc
--- /dev/null
+++ b/TelegramDownloader/Pages/Partials/ChatMessage.razor
@@ -0,0 +1,74 @@
+@using TL
+@using TelegramDownloader.Data
+@using TelegramDownloader.Models
+@using TelegramDownloader.Services
+@inject ITelegramService ts
+@inject NavigationManager NavManager
+
+@if(mess != null) {
+    <div aria-live="polite" aria-atomic="true" class="bottom-0 start-0" style="padding-bottom: 10px;">
+        <div class="toast-container position-static">
+            <div class="toast" style="display: block !important; width: 600px;">
+                <div class="toast-header">
+                    @* <img src="@(msg.media)" class="rounded me-2" alt="..."> *@
+                    <strong class="me-auto">@mess.user</strong>
+                    <small style="padding-right: 5px;">@mess.message.edit_date.ToShortDateString()</small>
+                    @if (mess.message.media is MessageMediaDocument { document: Document document })
+                    {
+                        <span>@HelperService.SizeSuffix(document.size)</span>
+                        <div class="dropdown">
+                            <button class="btn" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                <svg width="12" height="14" fill="currentColor" class="bi bi-three-dots-vertical" viewBox="0 0 16 16">
+                                    <path d="M9.5 13a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0zm0-5a1.5 1.5 0 1 1-3 0 1.5 1.5 0 0 1 3 0z" />
+                                </svg>
+                            </button>
+                            <ul class="dropdown-menu">
+                                <li><span class="dropdown-item" @onclick="() => modal.Open(mess)">Download</span></li>
+                                <li><span class="dropdown-item" @onclick="() => save(mess)">Download Now</span></li>
+                            </ul>
+                        </div>
+                    }
+
+                </div>
+                <div class="toast-body">
+                    <div>
+                        <div>
+                            @if (mess.message.media is MessageMediaDocument { document: Document document2 })
+                            {
+                                <span>@document2.Filename</span>
+                            }
+                        </div>
+                        <div>
+                            @if (mess.message.media is MessageMediaPhoto { photo: Photo photo })
+                            {
+                                <img alt="@photo.id" style="max-width:-webkit-fill-available;" src="/img/telegram/@($"{photo.id}.jpg")" />
+
+                            }
+                        </div>
+                        <div>
+                            @* @{
+                                            Regex rrg = new Regex(@"(https?://[^\s]+)");
+                                        }
+                                        @((MarkupString)rrg.Replace(msg.message, "<a href=\"$1\">$1</a>").Replace("\n", "<br>")) *@
+                            @((MarkupString)mess.htmlMessage.Replace("\n", "<br>"))
+                        </div>
+                        @* <div>@msg.media</div> *@
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+}
+
+
+@code {
+    [Parameter]
+    public ChatMessages mess { get; set; }
+    [Parameter]
+    public Modals.DownloadModal modal { get; set; }
+
+    public async Task save(ChatMessages cm)
+    {
+        await ts.DownloadFile(cm);
+    }
+}
diff --git a/TelegramDownloader/Pages/Partials/UploadsTable.razor b/TelegramDownloader/Pages/Partials/UploadsTable.razor
index e206f41..e4eb805 100644
--- a/TelegramDownloader/Pages/Partials/UploadsTable.razor
+++ b/TelegramDownloader/Pages/Partials/UploadsTable.razor
@@ -1,17 +1,18 @@
 @using TelegramDownloader.Data
 @using TelegramDownloader.Models
+@using TelegramDownloader.Pages.Modals.InfoModals
 @using TelegramDownloader.Services
 
 @inject TransactionInfoService tis
 
 <Grid @ref="grid"
-      TItem="UploadModel"
-      Class="table table-hover table-bordered table-striped"
-      DataProvider="UploadsDataProvider"
-      AllowFiltering="false"
-      AllowPaging="true"
-      AllowSorting="false"
-      Responsive="true">
+TItem="UploadModel"
+Class="table table-hover table-bordered table-striped"
+DataProvider="UploadsDataProvider"
+AllowFiltering="false"
+AllowPaging="true"
+AllowSorting="false"
+Responsive="true">
 
     <GridColumn TItem="UploadModel" Class="d-none d-md-table-cell" HeaderText="ID" PropertyName="id" SortString="id" SortKeySelector="item => item.id" FilterTextboxWidth="50" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center">
         @context.id
@@ -36,7 +37,12 @@
     <GridColumn TItem="UploadModel" HeaderText="Actions">
         @if (context.state == StateTask.Working)
         {
-            <td><button class="btn btn-danger" @onclick="() => cancel(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Cancel task"><i class="bi bi-x"></i></button></td>
+            <td>
+                <div class="btn-group" role="group">
+                    <button class="btn btn-danger" @onclick="() => cancel(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Cancel task"><i class="bi bi-x"></i></button>
+                    <button class="btn btn-info" @onclick="() => infoModal.ShowModal(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Show Info"><i class="bi bi-info"></i></button>
+                </div>
+            </td>
         }
 
         @if (context.state == StateTask.Canceled || context.state == StateTask.Error)
@@ -45,6 +51,7 @@
                 <div class="btn-group" role="group">
                     <button class="btn btn-info" @onclick="() => retry(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="retry task"><i class="bi bi-arrow-clockwise"></i></button>
                     <button class="btn btn-danger" @onclick="() => deleteUpload(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="delete task"><i class="bi bi-trash"></i></button>
+                    <button class="btn btn-info" @onclick="() => infoModal.ShowModal(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Show Info"><i class="bi bi-info"></i></button>
                 </div>
             </td>
         }
@@ -52,9 +59,12 @@
 
 </Grid>
 
+<TelegramDownloader.Pages.Modals.InfoModals.UploadFileInfoModal @ref="infoModal"></TelegramDownloader.Pages.Modals.InfoModals.UploadFileInfoModal>
+
 @code {
     public static List<UploadModel> lum = new List<UploadModel>();
     BlazorBootstrap.Grid<UploadModel> grid = default!;
+    UploadFileInfoModal infoModal { get; set; }
 
     protected override async Task OnInitializedAsync()
     {
diff --git a/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor b/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
index ba1d19c..ac8ca08 100644
--- a/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
+++ b/TelegramDownloader/Pages/Partials/impl/LocalFileManagerImpl.razor
@@ -73,7 +73,7 @@
         {
             // Items = Items.Prepend(new ToolBarItemModel() { Name = "NewFolder" }).ToList();
             Items.AddRange(new List<ToolBarItemModel>(){
-                    new ToolBarItemModel() { Name = "Upload File", Text = "Upload To Server", TooltipText = "Upload To server", PrefixIcon = "e-icons e-fe-upload" },
+                    new ToolBarItemModel() { Name = "Upload File", Text = "Upload To Local", TooltipText = "Upload To local", PrefixIcon = "e-icons e-fe-upload" },
                     new ToolBarItemModel() { Name = "UploadTelegram", Text = "Upload Telegram", TooltipText = "Upload File", PrefixIcon = "bi bi-telegram" },
 
                 }
@@ -262,7 +262,7 @@
             Modal.Open();
         }
 
-        if (args.Item.Text == "Upload To Server" && args.FileDetails.Count() > 0)
+        if (args.Item.Text == "Upload To Local" && args.FileDetails.Count() > 0)
         {
             ModalUpSer.id = id;
             ModalUpSer.url = "/api/file/Upload";
diff --git a/TelegramDownloader/TelegramDownloader.csproj b/TelegramDownloader/TelegramDownloader.csproj
index 6e6e020..1ba72ce 100644
--- a/TelegramDownloader/TelegramDownloader.csproj
+++ b/TelegramDownloader/TelegramDownloader.csproj
@@ -13,13 +13,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Blazor.Bootstrap" Version="3.2.0" />
+    <PackageReference Include="Blazor.Bootstrap" Version="3.3.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Log4Net.AspNetCore" Version="8.0.0" />
     <PackageReference Include="MongoDB.Driver" Version="3.1.0" />
     <PackageReference Include="QRCoder" Version="1.6.0" />
-    <PackageReference Include="Syncfusion.Blazor" Version="28.1.41" />
+    <PackageReference Include="Syncfusion.Blazor" Version="28.2.4" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
-    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="28.1.41" />
+    <PackageReference Include="Syncfusion.EJ2.AspNet.Core" Version="28.2.4" />
+    <PackageReference Include="System.IO.Hashing" Version="9.0.1" />
     <PackageReference Include="WTelegramClient" Version="4.2.8" />
   </ItemGroup>
 

From 7ce55c107ac6d5c02435c0c1a047f8e16362fb1f Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Thu, 13 Feb 2025 17:53:09 +0100
Subject: [PATCH 24/32] feat: add path for upload files in tooltip

---
 .../Pages/Partials/UploadsTable.razor         | 63 +++++++++++--------
 1 file changed, 37 insertions(+), 26 deletions(-)

diff --git a/TelegramDownloader/Pages/Partials/UploadsTable.razor b/TelegramDownloader/Pages/Partials/UploadsTable.razor
index e4eb805..126c8be 100644
--- a/TelegramDownloader/Pages/Partials/UploadsTable.razor
+++ b/TelegramDownloader/Pages/Partials/UploadsTable.razor
@@ -6,19 +6,19 @@
 @inject TransactionInfoService tis
 
 <Grid @ref="grid"
-TItem="UploadModel"
-Class="table table-hover table-bordered table-striped"
-DataProvider="UploadsDataProvider"
-AllowFiltering="false"
-AllowPaging="true"
-AllowSorting="false"
-Responsive="true">
+      TItem="UploadModel"
+      Class="table table-hover table-bordered table-striped"
+      DataProvider="UploadsDataProvider"
+      AllowFiltering="false"
+      AllowPaging="true"
+      AllowSorting="false"
+      Responsive="true">
 
     <GridColumn TItem="UploadModel" Class="d-none d-md-table-cell" HeaderText="ID" PropertyName="id" SortString="id" SortKeySelector="item => item.id" FilterTextboxWidth="50" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center">
         @context.id
     </GridColumn>
     <GridColumn TItem="UploadModel" HeaderText="File" PropertyName="name" SortString="name" SortKeySelector="item => item.name" FilterTextboxWidth="50" HeaderTextAlignment="Alignment.Center" TextAlignment="Alignment.Center">
-        @context.name
+        <Tooltip Class="me-4" Title="@context.path">@context.name</Tooltip>
     </GridColumn>
     <GridColumn TItem="UploadModel" HeaderText="State" PropertyName="state" SortString="state" SortKeySelector="item => item.state" FilterTextboxWidth="80">
         @context.state
@@ -35,26 +35,37 @@ Responsive="true">
         @context._transmittedString of @context._sizeString
     </GridColumn>
     <GridColumn TItem="UploadModel" HeaderText="Actions">
-        @if (context.state == StateTask.Working)
-        {
-            <td>
-                <div class="btn-group" role="group">
-                    <button class="btn btn-danger" @onclick="() => cancel(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Cancel task"><i class="bi bi-x"></i></button>
-                    <button class="btn btn-info" @onclick="() => infoModal.ShowModal(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Show Info"><i class="bi bi-info"></i></button>
-                </div>
-            </td>
+        @{
+            switch (context.state)
+            {
+                case StateTask.Working:
+                    <td>
+                        <div class="btn-group" role="group">
+                            <button class="btn btn-danger" @onclick="() => cancel(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Cancel task"><i class="bi bi-x"></i></button>
+                            <button class="btn btn-info" @onclick="() => infoModal.ShowModal(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Show Info"><i class="bi bi-info"></i></button>
+                        </div>
+                    </td>
+                    break;
+                case StateTask.Canceled:
+                case StateTask.Error:
+                    <td>
+                        <div class="btn-group" role="group">
+                            <button class="btn btn-info" @onclick="() => retry(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="retry task"><i class="bi bi-arrow-clockwise"></i></button>
+                            <button class="btn btn-danger" @onclick="() => deleteUpload(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="delete task"><i class="bi bi-trash"></i></button>
+                            <button class="btn btn-info" @onclick="() => infoModal.ShowModal(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Show Info"><i class="bi bi-info"></i></button>
+                        </div>
+                    </td>
+                    break;
+                default:
+                    <td>
+                        <div class="btn-group" role="group">
+                            <button class="btn btn-info" @onclick="() => infoModal.ShowModal(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Show Info"><i class="bi bi-info"></i></button>
+                        </div>
+                    </td>
+                    break;
+            }
         }
 
-        @if (context.state == StateTask.Canceled || context.state == StateTask.Error)
-        {
-            <td>
-                <div class="btn-group" role="group">
-                    <button class="btn btn-info" @onclick="() => retry(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="retry task"><i class="bi bi-arrow-clockwise"></i></button>
-                    <button class="btn btn-danger" @onclick="() => deleteUpload(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="delete task"><i class="bi bi-trash"></i></button>
-                    <button class="btn btn-info" @onclick="() => infoModal.ShowModal(context)" data-bs-toggle="tooltip" data-bs-placement="top" title="Show Info"><i class="bi bi-info"></i></button>
-                </div>
-            </td>
-        }
     </GridColumn>
 
 </Grid>

From a1e0bb99ff9dd416034fcba9975b24fd3d9134df Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Thu, 13 Feb 2025 23:29:30 +0100
Subject: [PATCH 25/32] feat: add  spinner

---
 .../Services/TransactionInfoService.cs        | 17 ++++++++++
 TelegramDownloader/Shared/MainLayout.razor    | 34 +++++++++++++++----
 2 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/TelegramDownloader/Services/TransactionInfoService.cs b/TelegramDownloader/Services/TransactionInfoService.cs
index 9ab9f99..d764978 100644
--- a/TelegramDownloader/Services/TransactionInfoService.cs
+++ b/TelegramDownloader/Services/TransactionInfoService.cs
@@ -8,6 +8,7 @@ public class TransactionInfoService
     {
         public static bool isPauseDownloads = false;
         public static event EventHandler<EventArgs> EventChanged;
+        public static event EventHandler TaskEventChanged;
         public static List<DownloadModel> downloadModels = new List<DownloadModel>();
         public static List<DownloadModel> pendingDownloadModels = new List<DownloadModel>();
         public static List<UploadModel> uploadModels = new List<UploadModel>();
@@ -16,12 +17,19 @@ public class TransactionInfoService
         private static Mutex PendingDownloadMutex = new Mutex();
         private static Mutex PendingUploadInfoTaskMutex = new Mutex();
 
+        public bool isWorking()
+        {
+            return downloadModels.Where(x => x.state == StateTask.Working).Count() > 0
+                || uploadModels.Where(x => x.state == StateTask.Working).Count() > 0;
+        }
+
         public void addToDownloadList(DownloadModel downloadModel)
         {
             PendingDownloadMutex.WaitOne(10000);
             downloadModels.Insert(0, downloadModel);
             PendingDownloadMutex.ReleaseMutex();
             EventChanged?.Invoke(this, new EventArgs());
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public void addToPendingDownloadList(DownloadModel downloadModel, bool atFirst = false, bool chekDownloads = true)
@@ -46,6 +54,7 @@ public void PauseDownloads()
                 dm.Pause();
             }
             PendingDownloadMutex.ReleaseMutex();
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public void PlayDownloads()
@@ -66,6 +75,7 @@ public void StopDownloads()
             }
             pendingDownloadModels.Clear();
             PendingDownloadMutex.ReleaseMutex();
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public async Task CheckPendingDownloads()
@@ -82,6 +92,7 @@ public async Task CheckPendingDownloads()
             }
             PendingDownloadMutex.ReleaseMutex();
             EventChanged?.Invoke(this, new EventArgs());
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public async Task CheckPendingUploadInfoTasks()
@@ -96,18 +107,21 @@ public async Task CheckPendingUploadInfoTasks()
             }
             PendingUploadInfoTaskMutex.ReleaseMutex();
             EventChanged?.Invoke(this, new EventArgs());
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public void addToUploadList(UploadModel uploadModel)
         {
             uploadModels.Insert(0, uploadModel);
             EventChanged?.Invoke(this, new EventArgs());
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public void deleteUploadInList(UploadModel uploadModel)
         {
             uploadModels.Remove(uploadModel);
             EventChanged?.Invoke(this, new EventArgs());
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public void addToInfoDownloadTaskList(InfoDownloadTaksModel infoDownloadModel)
@@ -155,6 +169,7 @@ public void deleteDownloadInList(DownloadModel downloadModel)
                 downloadModels.Remove(downloadModel);
             PendingDownloadMutex.ReleaseMutex();
             EventChanged?.Invoke(this, new EventArgs());
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public void deletePendingDownloadInList(DownloadModel downloadModel)
@@ -163,6 +178,7 @@ public void deletePendingDownloadInList(DownloadModel downloadModel)
             pendingDownloadModels.Remove(downloadModel);
             PendingDownloadMutex.ReleaseMutex();
             EventChanged?.Invoke(this, new EventArgs());
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public void deleteInfoDownloadTaskFromList(InfoDownloadTaksModel idt)
@@ -171,6 +187,7 @@ public void deleteInfoDownloadTaskFromList(InfoDownloadTaksModel idt)
             infoDownloadTaksModel.Remove(idt);
             PendingUploadInfoTaskMutex.ReleaseMutex();
             EventChanged?.Invoke(this, new EventArgs());
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public List<InfoDownloadTaksModel> getInfoDownloadTaksModel(int pageNumber, int pageSize)
diff --git a/TelegramDownloader/Shared/MainLayout.razor b/TelegramDownloader/Shared/MainLayout.razor
index 2b6c954..22ca17c 100644
--- a/TelegramDownloader/Shared/MainLayout.razor
+++ b/TelegramDownloader/Shared/MainLayout.razor
@@ -2,6 +2,7 @@
 @using TelegramDownloader.Data
 @using TelegramDownloader.Models
 @using TelegramDownloader.Models.GitHub
+@using TelegramDownloader.Services
 @using TelegramDownloader.Services.GitHub
 @using TelegramDownloader.Shared
 @inject ITelegramService ts
@@ -9,16 +10,17 @@
 @inject IJSRuntime JS
 @inject ModalService ModalService
 @inject GHService ghService;
+@inject TransactionInfoService tis;
 
 <PageTitle>TelegramFileManager</PageTitle>
 
 <style>
     .modalshow {
-        display: block
+    display: block
     }
 
     .modalhide {
-        display: none
+    display: none
     }
 </style>
 
@@ -32,13 +34,18 @@
 
     <main>
         <div class="top-row px-4">
+            @if(active) {
+                <Button Color="ButtonColor.None" Size="ButtonSize.Small" @onclick='() => Navigateto("/downloads")'>
+                    <Spinner Type="SpinnerType.Border" />
+                </Button>
+            }
             <Button Color="ButtonColor.None" Size="ButtonSize.Small" @onclick="() => ShowModalVersion(ModalType.Info)">
                 <Icon Name="IconName.InfoCircleFill" Size="IconSize.x2" Color="IconColor.Info" />
             </Button>
             <button class="btn" type="button" @onclick="openOffCanvasMenu"><i class="bi bi-three-dots"></i></button>
         </div>
         <TelegramDownloader.Pages.Modals.ToastNotify></TelegramDownloader.Pages.Modals.ToastNotify>
-        
+
         <article class="content px-4">
             <div id="modalFileUploadVue">
                 <TelegramDownloader.Pages.Modals.FileUploadModalTemplate></TelegramDownloader.Pages.Modals.FileUploadModalTemplate>
@@ -48,7 +55,7 @@
         </article>
 
         <Offcanvas @ref="offcanvas"
-                   title="Menu">
+        title="Menu">
             <BodyTemplate>
                 <div class="list-group list-group-flush">
                     <button @onclick=' () => Navigateto("/config")' class="list-group-item list-group-item-action"><i class="bi bi-gear"></i> Configuration</button>
@@ -59,7 +66,7 @@
             </BodyTemplate>
         </Offcanvas>
         <TelegramDownloader.Pages.Modals.ImportDataModal isShared=true @ref="ImportModal" OnCloseCallback="reloadMenu"></TelegramDownloader.Pages.Modals.ImportDataModal>
-        
+
         <Modal IsServiceModal="true" />
         <Toasts class="p-3" AutoHide="true" Delay="4000" Placement="ToastsPlacement.TopRight" />
     </main>
@@ -72,6 +79,7 @@
     private Pages.Modals.ImportDataModal ImportModal { get; set; }
     private GithubVersionModel LastVersion { get; set; }
     private NavMenu menu { get; set; }
+    private bool active { get; set; } = true;
 
     protected override async Task OnAfterRenderAsync(bool firstRender)
     {
@@ -86,9 +94,13 @@
             {
                 Console.WriteLine(e);
             }
-
         }
+    }
 
+    protected override async Task OnInitializedAsync()
+    {
+        checkWorkingTasks();
+        TransactionInfoService.TaskEventChanged += eventChangedWorkingTasks;
     }
 
     private async Task reloadMenu()
@@ -145,4 +157,14 @@
         NavManager.NavigateTo("/");
         StateHasChanged();
     }
+
+    private async Task checkWorkingTasks() {
+        active = tis.isWorking();
+        await InvokeAsync(StateHasChanged);
+    }
+
+    private void eventChangedWorkingTasks(object sender, System.EventArgs e)
+    {
+        checkWorkingTasks();
+    }
 }

From 3120577d754d6ab447c8a2d9a8cfbdecaa9dd570 Mon Sep 17 00:00:00 2001
From: mateof <mateof@gmail.com>
Date: Fri, 14 Feb 2025 16:56:27 +0100
Subject: [PATCH 26/32] feat: add mac os arm version

---
 .github/workflows/buildrelease.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/.github/workflows/buildrelease.yml b/.github/workflows/buildrelease.yml
index 328007e..ada4951 100644
--- a/.github/workflows/buildrelease.yml
+++ b/.github/workflows/buildrelease.yml
@@ -88,3 +88,15 @@ jobs:
             env:
               GH_TOKEN: ${{ secrets.TOKENBuild }}
             shell: bash
+
+          - name: '📦 Package mac OS arm64'
+            run: |
+                TAG=${{github.event.release.tag_name}}
+                TAG=${TAG:1}
+                cd ${{github.workspace}}
+                dotnet publish TelegramDownloader/TelegramDownloader.csproj -r osx-arm64 -c Release -o bin/osx-arm64 -p:PublishSingleFile=true,Version=$TAG --self-contained
+                zip -r TelegramFileManager-${{github.event.release.tag_name}}-osx-arm64.zip bin/osx-arm64
+                gh release upload ${{github.event.release.tag_name}} TelegramFileManager-${{github.event.release.tag_name}}-osx-arm64.zip
+            env:
+              GH_TOKEN: ${{ secrets.TOKENBuild }}
+            shell: bash

From c14d56c5cb5b1058ab910af03538b9ff85d34f24 Mon Sep 17 00:00:00 2001
From: mateof <mateof@gmail.com>
Date: Wed, 19 Feb 2025 22:44:28 +0100
Subject: [PATCH 27/32] feat: show speed (#27)

* version: from Develop (#26)

macos arm

* feat: show speed upload and download
---
 TelegramDownloader/Models/DownloadModel.cs    |   7 ++
 TelegramDownloader/Pages/_Layout.cshtml       |   1 +
 TelegramDownloader/Services/HelperService.cs  |   5 +
 .../Services/TransactionInfoService.cs        | 109 +++++++++++++++++-
 TelegramDownloader/Shared/MainLayout.razor    |  15 +++
 .../wwwroot/css/custombuttons.css             |  34 ++++++
 TelegramDownloader/wwwroot/css/site.css       |   3 +-
 7 files changed, 170 insertions(+), 4 deletions(-)
 create mode 100644 TelegramDownloader/wwwroot/css/custombuttons.css

diff --git a/TelegramDownloader/Models/DownloadModel.cs b/TelegramDownloader/Models/DownloadModel.cs
index 08af6aa..ac4f8b4 100644
--- a/TelegramDownloader/Models/DownloadModel.cs
+++ b/TelegramDownloader/Models/DownloadModel.cs
@@ -119,6 +119,7 @@ private void deleteNotWorkingTasks()
     }
     public class DownloadModel
     {
+        public Mutex mutex = new Mutex();
         public event EventHandler<DownloadEventArgs> EventChanged;
         public string id = Guid.NewGuid().ToString();
         public string action { get; set; } = "Download";
@@ -137,6 +138,7 @@ public class DownloadModel
         public IPeerInfo channel { get; set; }
         public string channelName { get; set; }
         public int progress { get; set; }
+        public long accumulatedSize { get; set; } = 0;
 
         public DownloadModel(string? name = null)
         {
@@ -155,6 +157,8 @@ public void ProgressCallback(long transmitted, long totalSize)
                 tis.deleteDownloadInList(this);
                 throw new Exception($"Paused {name}");
             }
+            TransactionInfoService.addDownloadBytes(transmitted - accumulatedSize);
+            accumulatedSize = transmitted;
             _transmitted = transmitted;
             _sizeString = HelperService.SizeSuffix(totalSize);
             _transmittedString = HelperService.SizeSuffix(transmitted);
@@ -210,11 +214,14 @@ public class UploadModel
         public IPeerInfo channel { get; set; }
         public int progress { get; set; }
         public Thread thread { get; set; }
+        public long accumulatedSize { get; set; } = 0;
 
         public virtual void ProgressCallback(long transmitted, long totalSize)
         {
             if (state == StateTask.Canceled)
                 throw new Exception($"Canceled {name}");
+            TransactionInfoService.addUploadBytes(transmitted - accumulatedSize);
+            accumulatedSize = transmitted;
             _transmitted = transmitted;
             _sizeString = HelperService.SizeSuffix(totalSize);
             _transmittedString = HelperService.SizeSuffix(transmitted);
diff --git a/TelegramDownloader/Pages/_Layout.cshtml b/TelegramDownloader/Pages/_Layout.cshtml
index b815aaf..2c703e6 100644
--- a/TelegramDownloader/Pages/_Layout.cshtml
+++ b/TelegramDownloader/Pages/_Layout.cshtml
@@ -22,6 +22,7 @@
     <link href="https://vjs.zencdn.net/8.16.1/video-js.css" rel="stylesheet" />
 
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+    
 </head>
 <body>
     
diff --git a/TelegramDownloader/Services/HelperService.cs b/TelegramDownloader/Services/HelperService.cs
index 84bb373..2baffc8 100644
--- a/TelegramDownloader/Services/HelperService.cs
+++ b/TelegramDownloader/Services/HelperService.cs
@@ -23,6 +23,11 @@ public  static string SizeSuffix(Int64 value, int decimalPlaces = 1)
             return string.Format("{0:n" + decimalPlaces + "} {1}", dValue, SizeSuffixes[i]);
         }
 
+        public static string SizeSuffixPerTime(Int64 value, String time = "s", int decimalPlaces = 1)
+        {
+            return SizeSuffix(value, decimalPlaces) + "/" + time;
+        }
+
         public static async Task<DirectorySizeModel> GetDirecctorySizeAsync(string path)
         {
             DirectoryInfo dirInfo = new DirectoryInfo(path);
diff --git a/TelegramDownloader/Services/TransactionInfoService.cs b/TelegramDownloader/Services/TransactionInfoService.cs
index d764978..f9b1c2e 100644
--- a/TelegramDownloader/Services/TransactionInfoService.cs
+++ b/TelegramDownloader/Services/TransactionInfoService.cs
@@ -1,11 +1,15 @@
-using TelegramDownloader.Models;
+using System.Timers;
+using TelegramDownloader.Models;
 using TelegramDownloader.Pages.Modals;
 using TL;
+using Timer = System.Timers.Timer;
 
 namespace TelegramDownloader.Services
 {
     public class TransactionInfoService
     {
+        private static Timer aTimer;
+
         public static bool isPauseDownloads = false;
         public static event EventHandler<EventArgs> EventChanged;
         public static event EventHandler TaskEventChanged;
@@ -13,14 +17,111 @@ public class TransactionInfoService
         public static List<DownloadModel> pendingDownloadModels = new List<DownloadModel>();
         public static List<UploadModel> uploadModels = new List<UploadModel>();
         public static List<InfoDownloadTaksModel> infoDownloadTaksModel = new List<InfoDownloadTaksModel>();
+        public static String downloadSpeed = "0 KB/s";
+        public static String uploadSpeed = "0 KB/s";
+        public static long bytesUploaded = 0;
+        public static long bytesDownloaded = 0;
 
         private static Mutex PendingDownloadMutex = new Mutex();
         private static Mutex PendingUploadInfoTaskMutex = new Mutex();
+        private static Mutex DownloadBytesMutex = new Mutex();
+        private static Mutex UploadBytesMutex = new Mutex();
 
         public bool isWorking()
         {
-            return downloadModels.Where(x => x.state == StateTask.Working).Count() > 0
-                || uploadModels.Where(x => x.state == StateTask.Working).Count() > 0;
+            if (!(downloadModels.Where(x => x.state == StateTask.Working).Count() > 0
+                || uploadModels.Where(x => x.state == StateTask.Working).Count() > 0))
+            {
+                stopTimer();
+                return false;
+            }
+            return true;
+        }
+
+        public bool isUploading()
+        {
+            return uploadModels.Where(x => x.state == StateTask.Working).Count() > 0;
+        }
+
+        public bool isDownloading()
+        {
+            return downloadModels.Where(x => x.state == StateTask.Working).Count() > 0;
+        }
+
+        public static void startTimer()
+        {
+            if (aTimer == null || !aTimer.Enabled)
+            {
+                if (aTimer != null)
+                {
+                    aTimer.Start();
+                    return;
+                }
+                aTimer = new Timer(1000);
+                aTimer.Elapsed += OnTimedEvent;
+                aTimer.AutoReset = true;
+                aTimer.Enabled = true;
+            }
+        }
+
+        public static void stopTimer()
+        {
+            if (aTimer != null && aTimer.Enabled)
+            {
+                aTimer.Stop();
+                resetUploadBytes();
+                resetDownloadBytes();
+            }
+        }
+
+        private static void OnTimedEvent(Object source, ElapsedEventArgs e)
+        {
+            Console.WriteLine("El evento Elapsed se disparó a las {0:HH:mm:ss.fff}", e.SignalTime);
+            if (bytesDownloaded > 0)
+                setDownloadSpeed(HelperService.SizeSuffixPerTime(bytesDownloaded));
+            if (bytesUploaded > 0)
+                setUploadSpeed(HelperService.SizeSuffixPerTime(bytesUploaded));
+            resetDownloadBytes();
+        }
+
+        public static async Task addDownloadBytes(long bytes)
+        {
+            DownloadBytesMutex.WaitOne();
+            bytesDownloaded += bytes;
+            DownloadBytesMutex.ReleaseMutex();
+        }
+
+        public static async Task addUploadBytes(long bytes)
+        {
+            UploadBytesMutex.WaitOne();
+            bytesUploaded += bytes;
+            UploadBytesMutex.ReleaseMutex();
+        }
+
+        public static async Task resetDownloadBytes()
+        {
+            DownloadBytesMutex.WaitOne();
+            bytesDownloaded = 0;
+            DownloadBytesMutex.ReleaseMutex();
+        }
+
+        public static async Task resetUploadBytes()
+        {
+            UploadBytesMutex.WaitOne();
+            bytesUploaded = 0;
+            UploadBytesMutex.ReleaseMutex();
+        }
+
+        public static void setDownloadSpeed(String speed)
+        {
+            downloadSpeed = speed;
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
+        }
+
+        public static void setUploadSpeed(String speed)
+        {
+            uploadSpeed = speed;
+            TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
         public void addToDownloadList(DownloadModel downloadModel)
@@ -89,6 +190,7 @@ public async Task CheckPendingDownloads()
                 downloadModels.Insert(0, dm);
                 pendingDownloadModels.Remove(dm);
                 dm.RetryCallback();
+                startTimer();
             }
             PendingDownloadMutex.ReleaseMutex();
             EventChanged?.Invoke(this, new EventArgs());
@@ -104,6 +206,7 @@ public async Task CheckPendingUploadInfoTasks()
                 InfoDownloadTaksModel idt = infoDownloadTaksModel.Where(x => x.state == StateTask.Pending).OrderBy(x => x.creationDate).FirstOrDefault();
                 idt.state = StateTask.Working;
                 idt.RetryCallback();
+                startTimer();
             }
             PendingUploadInfoTaskMutex.ReleaseMutex();
             EventChanged?.Invoke(this, new EventArgs());
diff --git a/TelegramDownloader/Shared/MainLayout.razor b/TelegramDownloader/Shared/MainLayout.razor
index 22ca17c..c72f9bf 100644
--- a/TelegramDownloader/Shared/MainLayout.razor
+++ b/TelegramDownloader/Shared/MainLayout.razor
@@ -24,6 +24,8 @@
     }
 </style>
 
+<link href="css/custombuttons.css" rel="stylesheet" />
+
 <Preload LoadingText="Loading..." />
 
 
@@ -35,6 +37,19 @@
     <main>
         <div class="top-row px-4">
             @if(active) {
+                @if (tis.isUploading())
+                {
+                    <button class="btn btn-primary download-button" @onclick='() => Navigateto("/downloads")'>
+                        <Icon Class="arrow" Name="IconName.ArrowUp"></Icon>
+                        <span>@TransactionInfoService.uploadSpeed</span>
+                    </button>
+                }
+                @if(tis.isDownloading()) {
+                    <button class="btn btn-primary download-button" @onclick='() => Navigateto("/downloads")'>
+                        <Icon Class="arrow" Name="IconName.ArrowDown"></Icon>
+                        <span>@TransactionInfoService.downloadSpeed</span>
+                    </button>
+                }
                 <Button Color="ButtonColor.None" Size="ButtonSize.Small" @onclick='() => Navigateto("/downloads")'>
                     <Spinner Type="SpinnerType.Border" />
                 </Button>
diff --git a/TelegramDownloader/wwwroot/css/custombuttons.css b/TelegramDownloader/wwwroot/css/custombuttons.css
new file mode 100644
index 0000000..b255019
--- /dev/null
+++ b/TelegramDownloader/wwwroot/css/custombuttons.css
@@ -0,0 +1,34 @@
+/* Download and upload buttons*/
+
+.download-button {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 10px 20px;
+    background-color: transparent;
+    border: 2px solid #007bff; /* borde de color */
+    color: #007bff; /* color del texto y el icono */
+}
+
+    .download-button .arrow {
+        margin-right: 10px;
+        animation: bounce 1s infinite;
+    }
+
+@keyframes bounce {
+    0%, 20%, 50%, 80%, 100% {
+        transform: translateY(0);
+    }
+
+    40% {
+        transform: translateY(-10px);
+    }
+
+    60% {
+        transform: translateY(-5px);
+    }
+}
+
+.download-button:hover {
+    background-color: rgba(0, 123, 255, 0.1); /* ligero cambio de fondo en hover */
+}
diff --git a/TelegramDownloader/wwwroot/css/site.css b/TelegramDownloader/wwwroot/css/site.css
index fb6f68c..1d7b996 100644
--- a/TelegramDownloader/wwwroot/css/site.css
+++ b/TelegramDownloader/wwwroot/css/site.css
@@ -101,4 +101,5 @@ a, .btn-link {
     width: 90%;
     padding-left: 10%;
     padding-bottom: 5%;
-}
\ No newline at end of file
+}
+

From df22f6e7a1c25c9e5e1bc2561ce9234124857308 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Thu, 20 Feb 2025 17:34:18 +0100
Subject: [PATCH 28/32] refactor: modify transactionInfoService to singleton

---
 .../Controllers/FileController.cs             |  1 +
 TelegramDownloader/Data/FileService.cs        | 13 ++++--
 TelegramDownloader/Data/TelegramService.cs    |  9 ++++
 TelegramDownloader/Models/DownloadModel.cs    | 15 +++----
 TelegramDownloader/Pages/Downloads.razor      |  9 ++--
 .../Pages/Partials/DownloadsTable.razor       |  2 +-
 .../Pages/Partials/TasksTable.razor           |  2 +-
 .../Pages/Partials/UploadsTable.razor         |  2 +-
 TelegramDownloader/Program.cs                 |  6 ++-
 TelegramDownloader/Services/ServiceLocator.cs |  7 +++
 .../Services/TransactionInfoService.cs        | 44 +++++++++----------
 TelegramDownloader/Shared/MainLayout.razor    |  6 +--
 12 files changed, 70 insertions(+), 46 deletions(-)
 create mode 100644 TelegramDownloader/Services/ServiceLocator.cs

diff --git a/TelegramDownloader/Controllers/FileController.cs b/TelegramDownloader/Controllers/FileController.cs
index 9304351..560e883 100644
--- a/TelegramDownloader/Controllers/FileController.cs
+++ b/TelegramDownloader/Controllers/FileController.cs
@@ -247,6 +247,7 @@ public async Task<IActionResult> GetFile(string id, string? idChannel, string? i
                 cm.message = idM;
                 file = new FileStream(System.IO.Path.Combine(FileService.TEMPDIR, "_temp", $"{idChannel}-{idFile}-{id}"), FileMode.Create, FileAccess.ReadWrite);
                 DownloadModel dm = new DownloadModel();
+                dm.tis = _tis;
                 dm.channelName = _ts.getChatName(Convert.ToInt64(idChannel));
                 _tis.addToDownloadList(dm);
                 await _ts.DownloadFileAndReturn(cm, file, model: dm);
diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index d4c1869..d41ddbc 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -796,6 +796,7 @@ public static void functionCalll(string dbName, int messageId, string destPath)
         private async Task downloadFromTelegram(string dbName, int messageId, string destPath, BsonFileManagerModel file = null)
         {
             DownloadModel model = new DownloadModel();
+            model.tis = _tis;
             if (file != null)
             {
                 model.name = file.Name;
@@ -817,7 +818,11 @@ private async Task downloadFromTelegram(string dbName, int messageId, string des
         public async Task DownloadFileFromChat(ChatMessages message, string fileName = null, string folder = null, DownloadModel model = null)
         {
             if (model == null)
+            {
                 model = new DownloadModel();
+                model.tis = _tis;
+            }
+                
             model.name = fileName;
             if (message.message.media is MessageMediaDocument { document: Document document })
             {
@@ -1099,6 +1104,7 @@ public async Task CreateDatabase(string id)
         public async Task AddUploadFileFromServer(string dbName, string currentPath, List<Syncfusion.Blazor.FileManager.FileManagerDirectoryContent> files, InfoDownloadTaksModel idt = null) // ItemsUploadedEventArgs<FileManagerDirectoryContent> args)
         {
             idt = new InfoDownloadTaksModel();
+            idt.tis = _tis;
             idt.id = Guid.NewGuid().ToString();
             idt.total = 0;
             idt.totalSize = 0;
@@ -1135,9 +1141,8 @@ public async Task AddUploadFileFromServer(string dbName, string currentPath, Lis
             }
             idt.callbacks = new Callbacks();
             idt.callbacks.callback = async () => await UploadFileFromServer(dbName, currentPath, files, idt);
-            TransactionInfoService ti = new TransactionInfoService();
-            ti.addToInfoDownloadTaskList(idt);
-            ti.CheckPendingUploadInfoTasks();
+            _tis.addToInfoDownloadTaskList(idt);
+            _tis.CheckPendingUploadInfoTasks();
         }
 
 
@@ -1254,6 +1259,7 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                                 int attempts = 3;
                                 int waitForNextAttempt = 1000;
                                 UploadModel um = new UploadModel();
+                                um.tis = _tis;
                                 um.path = currentFilePath;
                                 um.chatName = _ts.getChatName(Convert.ToInt64(dbName));
                                 // add upload to task list
@@ -1303,6 +1309,7 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                             int attempts = 3;
                             int waitForNextAttempt = 60000;
                             UploadModel um = new UploadModel();
+                            um.tis = _tis;
                             um.path = currentFilePath;
                             um.chatName = _ts.getChatName(Convert.ToInt64(dbName));
                             // add upload to task list
diff --git a/TelegramDownloader/Data/TelegramService.cs b/TelegramDownloader/Data/TelegramService.cs
index 56e9079..d7d7adc 100644
--- a/TelegramDownloader/Data/TelegramService.cs
+++ b/TelegramDownloader/Data/TelegramService.cs
@@ -285,6 +285,7 @@ public async Task<List<ChatViewBase>> getAllSavedChats()
         public async Task<Message> uploadFile(string chatId, Stream file, string fileName, string mimeType = null, UploadModel um = null)
         {
             um = um ?? new UploadModel();
+            um.tis = _tis;
 
             InputPeer peer = chats.chats[Convert.ToInt64(chatId)];
             um.name = fileName;
@@ -417,7 +418,11 @@ public async Task RemoveFavouriteChannel(long id)
         public async Task<Stream> DownloadFileAndReturn(ChatMessages message, Stream ms = null, string fileName = null, string folder = null, DownloadModel model = null)
         {
             if (model == null)
+            {
                 model = new DownloadModel();
+                model.tis = _tis;
+            }
+                
             model.m = message;
             model.channel = message.user;
 
@@ -466,7 +471,11 @@ public async Task<Stream> DownloadFileAndReturn(ChatMessages message, Stream ms
         public async Task<string> DownloadFile(ChatMessages message, string fileName = null, string folder = null, DownloadModel model = null, bool shouldAddToList = false)
         {
             if (model == null)
+            {
                 model = new DownloadModel();
+                model.tis = _tis;
+            }
+                
             model.m = message;
             model.channel = message.user;
 
diff --git a/TelegramDownloader/Models/DownloadModel.cs b/TelegramDownloader/Models/DownloadModel.cs
index ac4f8b4..c90d542 100644
--- a/TelegramDownloader/Models/DownloadModel.cs
+++ b/TelegramDownloader/Models/DownloadModel.cs
@@ -32,6 +32,7 @@ public class InfoDownloadTaksModel
         public int progress { get; set; }
         public List<UploadModel> currentUploads { get; set; } = new List<UploadModel>();
         public List<DownloadModel> currentDownloads { get; set; } = new List<DownloadModel>();
+        public  TransactionInfoService tis { get; set; }
 
         public async void AddOne(long size)
         {
@@ -48,7 +49,6 @@ public async void AddOne(long size)
         public async void markAsCompleted()
         {
             state = StateTask.Completed;
-            TransactionInfoService tis = new TransactionInfoService();
             tis.CheckPendingUploadInfoTasks();
             EventChanged?.Invoke(this, new InfoTaskEventArgs());
 
@@ -82,7 +82,6 @@ public void Retry()
         {
             state = StateTask.Pending;
             currentUpload = 0;
-            TransactionInfoService tis = new TransactionInfoService();
             tis.CheckPendingUploadInfoTasks();
         }
 
@@ -107,7 +106,6 @@ public void cancelTask()
                     um.Cancel();
                 }
             }
-            TransactionInfoService tis = new TransactionInfoService();
             tis.CheckPendingUploadInfoTasks();
         }
 
@@ -139,6 +137,8 @@ public class DownloadModel
         public string channelName { get; set; }
         public int progress { get; set; }
         public long accumulatedSize { get; set; } = 0;
+        public TransactionInfoService tis { get; set; }
+
 
         public DownloadModel(string? name = null)
         {
@@ -152,12 +152,12 @@ public void ProgressCallback(long transmitted, long totalSize)
                 throw new Exception($"Canceled {name}");
             if (state == StateTask.Paused)
             {
-                TransactionInfoService tis = new TransactionInfoService();
+                
                 state = StateTask.Working;
                 tis.deleteDownloadInList(this);
                 throw new Exception($"Paused {name}");
             }
-            TransactionInfoService.addDownloadBytes(transmitted - accumulatedSize);
+            tis.addDownloadBytes(transmitted - accumulatedSize);
             accumulatedSize = transmitted;
             _transmitted = transmitted;
             _sizeString = HelperService.SizeSuffix(totalSize);
@@ -169,7 +169,6 @@ public void ProgressCallback(long transmitted, long totalSize)
                 state = StateTask.Completed;
                 NotificationModel nm = new NotificationModel();
                 nm.sendEvent(new Notification($"Download {name} completed", "Download Completed", NotificationTypes.Success));
-                TransactionInfoService tis = new TransactionInfoService();
                 tis.CheckPendingDownloads();
             }
 
@@ -178,7 +177,6 @@ public void ProgressCallback(long transmitted, long totalSize)
         public void Cancel()
         {
             state = StateTask.Canceled;
-            TransactionInfoService tis = new TransactionInfoService();
             tis.CheckPendingDownloads();
             EventChanged?.Invoke(this, new DownloadEventArgs());
         }
@@ -215,12 +213,13 @@ public class UploadModel
         public int progress { get; set; }
         public Thread thread { get; set; }
         public long accumulatedSize { get; set; } = 0;
+        public TransactionInfoService tis { get; set; }
 
         public virtual void ProgressCallback(long transmitted, long totalSize)
         {
             if (state == StateTask.Canceled)
                 throw new Exception($"Canceled {name}");
-            TransactionInfoService.addUploadBytes(transmitted - accumulatedSize);
+            tis.addUploadBytes(transmitted - accumulatedSize);
             accumulatedSize = transmitted;
             _transmitted = transmitted;
             _sizeString = HelperService.SizeSuffix(totalSize);
diff --git a/TelegramDownloader/Pages/Downloads.razor b/TelegramDownloader/Pages/Downloads.razor
index e13b021..c952486 100644
--- a/TelegramDownloader/Pages/Downloads.razor
+++ b/TelegramDownloader/Pages/Downloads.razor
@@ -21,7 +21,7 @@
             <div style="padding: 1em">
                 <div class="btn-group" role="group" aria-label="Basic outlined example">
                     <button class="btn btn-success" @onclick="clearDownloads" data-bs-toggle="tooltip" data-bs-placement="top" title="Clear completed and error"><i class="bi bi-trash"></i> Clear</button>
-                    @if (TransactionInfoService.isPauseDownloads)
+                    @if (tis.isPauseDownloads)
                     {
                         <button type="button" @onclick="() => tis.PlayDownloads()" class="btn btn-outline-primary"><i class="bi bi-play"></i></button>
                     } else
@@ -59,7 +59,6 @@
 
 
 @code {
-    TransactionInfoService ts = new TransactionInfoService();
     protected override async Task OnInitializedAsync()
     {
     }
@@ -67,17 +66,17 @@
     
     async Task clearUploads()
     {
-        ts.clearUploadCompleted();
+        tis.clearUploadCompleted();
     }
 
     async Task clearDownloads()
     {
-        ts.clearDownloadCompleted();
+        tis.clearDownloadCompleted();
     }
 
     async Task clearTasks()
     {
-        ts.clearTasksCompleted();
+        tis.clearTasksCompleted();
     }
 
     
diff --git a/TelegramDownloader/Pages/Partials/DownloadsTable.razor b/TelegramDownloader/Pages/Partials/DownloadsTable.razor
index 0a2beca..7e28fb2 100644
--- a/TelegramDownloader/Pages/Partials/DownloadsTable.razor
+++ b/TelegramDownloader/Pages/Partials/DownloadsTable.razor
@@ -68,7 +68,7 @@ Responsive="true">
     protected override async Task OnInitializedAsync()
     {
         checkNewEventsHandler();
-        TransactionInfoService.EventChanged += eventChangedNew;
+        tis.EventChanged += eventChangedNew;
     }
 
     private async Task<GridDataProviderResult<DownloadModel>> DownloadsDataProvider(GridDataProviderRequest<DownloadModel> request)
diff --git a/TelegramDownloader/Pages/Partials/TasksTable.razor b/TelegramDownloader/Pages/Partials/TasksTable.razor
index 9b4dca1..fe6cec6 100644
--- a/TelegramDownloader/Pages/Partials/TasksTable.razor
+++ b/TelegramDownloader/Pages/Partials/TasksTable.razor
@@ -68,7 +68,7 @@
     protected override async Task OnInitializedAsync()
     {
         checkNewEventsHandler();
-        TransactionInfoService.EventChanged += eventChangedNew;
+        tis.EventChanged += eventChangedNew;
     }
 
     private async Task<GridDataProviderResult<InfoDownloadTaksModel>> TasksDataProvider(GridDataProviderRequest<InfoDownloadTaksModel> request)
diff --git a/TelegramDownloader/Pages/Partials/UploadsTable.razor b/TelegramDownloader/Pages/Partials/UploadsTable.razor
index da066f8..37b02cd 100644
--- a/TelegramDownloader/Pages/Partials/UploadsTable.razor
+++ b/TelegramDownloader/Pages/Partials/UploadsTable.razor
@@ -80,7 +80,7 @@ Responsive="true">
     protected override async Task OnInitializedAsync()
     {
         checkNewEventsHandler();
-        TransactionInfoService.EventChanged += eventChangedNew;
+        tis.EventChanged += eventChangedNew;
     }
 
     private async Task cancel(UploadModel um)
diff --git a/TelegramDownloader/Program.cs b/TelegramDownloader/Program.cs
index 5ab0198..c3c8d15 100644
--- a/TelegramDownloader/Program.cs
+++ b/TelegramDownloader/Program.cs
@@ -57,12 +57,14 @@
 // Add services to the container.
 builder.Services.AddRazorPages();
 builder.Services.AddServerSideBlazor();
-builder.Services.AddTransient<ITelegramService, TelegramService>();
+builder.Services.AddSingleton<ITelegramService, TelegramService>();
 builder.Services.AddSingleton<IDbService, DbService>();
 builder.Services.AddTransient<IFileService, FileService>();
-builder.Services.AddTransient<TransactionInfoService>();
+builder.Services.AddSingleton<TransactionInfoService>();
 builder.Services.AddSingleton<FileManagerService>();
 builder.Services.AddSingleton<GHService>();
+
+ServiceLocator.ServiceProvider = builder.Services.BuildServiceProvider();
 builder.Services.AddBlazorBootstrap();
 
 
diff --git a/TelegramDownloader/Services/ServiceLocator.cs b/TelegramDownloader/Services/ServiceLocator.cs
new file mode 100644
index 0000000..cbc1619
--- /dev/null
+++ b/TelegramDownloader/Services/ServiceLocator.cs
@@ -0,0 +1,7 @@
+namespace TelegramDownloader.Services
+{
+    public static class ServiceLocator
+    {
+        public static IServiceProvider ServiceProvider { get; set; }
+    }
+}
diff --git a/TelegramDownloader/Services/TransactionInfoService.cs b/TelegramDownloader/Services/TransactionInfoService.cs
index f9b1c2e..ada58ba 100644
--- a/TelegramDownloader/Services/TransactionInfoService.cs
+++ b/TelegramDownloader/Services/TransactionInfoService.cs
@@ -8,19 +8,19 @@ namespace TelegramDownloader.Services
 {
     public class TransactionInfoService
     {
-        private static Timer aTimer;
-
-        public static bool isPauseDownloads = false;
-        public static event EventHandler<EventArgs> EventChanged;
-        public static event EventHandler TaskEventChanged;
-        public static List<DownloadModel> downloadModels = new List<DownloadModel>();
-        public static List<DownloadModel> pendingDownloadModels = new List<DownloadModel>();
-        public static List<UploadModel> uploadModels = new List<UploadModel>();
-        public static List<InfoDownloadTaksModel> infoDownloadTaksModel = new List<InfoDownloadTaksModel>();
-        public static String downloadSpeed = "0 KB/s";
-        public static String uploadSpeed = "0 KB/s";
-        public static long bytesUploaded = 0;
-        public static long bytesDownloaded = 0;
+        private Timer aTimer;
+
+        public bool isPauseDownloads = false;
+        public event EventHandler<EventArgs> EventChanged;
+        public event EventHandler TaskEventChanged;
+        public List<DownloadModel> downloadModels = new List<DownloadModel>();
+        public List<DownloadModel> pendingDownloadModels = new List<DownloadModel>();
+        public List<UploadModel> uploadModels = new List<UploadModel>();
+        public List<InfoDownloadTaksModel> infoDownloadTaksModel = new List<InfoDownloadTaksModel>();
+        public String downloadSpeed = "0 KB/s";
+        public String uploadSpeed = "0 KB/s";
+        public long bytesUploaded = 0;
+        public long bytesDownloaded = 0;
 
         private static Mutex PendingDownloadMutex = new Mutex();
         private static Mutex PendingUploadInfoTaskMutex = new Mutex();
@@ -48,7 +48,7 @@ public bool isDownloading()
             return downloadModels.Where(x => x.state == StateTask.Working).Count() > 0;
         }
 
-        public static void startTimer()
+        public void startTimer()
         {
             if (aTimer == null || !aTimer.Enabled)
             {
@@ -64,7 +64,7 @@ public static void startTimer()
             }
         }
 
-        public static void stopTimer()
+        public void stopTimer()
         {
             if (aTimer != null && aTimer.Enabled)
             {
@@ -74,7 +74,7 @@ public static void stopTimer()
             }
         }
 
-        private static void OnTimedEvent(Object source, ElapsedEventArgs e)
+        private void OnTimedEvent(Object source, ElapsedEventArgs e)
         {
             Console.WriteLine("El evento Elapsed se disparó a las {0:HH:mm:ss.fff}", e.SignalTime);
             if (bytesDownloaded > 0)
@@ -84,41 +84,41 @@ private static void OnTimedEvent(Object source, ElapsedEventArgs e)
             resetDownloadBytes();
         }
 
-        public static async Task addDownloadBytes(long bytes)
+        public async Task addDownloadBytes(long bytes)
         {
             DownloadBytesMutex.WaitOne();
             bytesDownloaded += bytes;
             DownloadBytesMutex.ReleaseMutex();
         }
 
-        public static async Task addUploadBytes(long bytes)
+        public async Task addUploadBytes(long bytes)
         {
             UploadBytesMutex.WaitOne();
             bytesUploaded += bytes;
             UploadBytesMutex.ReleaseMutex();
         }
 
-        public static async Task resetDownloadBytes()
+        public async Task resetDownloadBytes()
         {
             DownloadBytesMutex.WaitOne();
             bytesDownloaded = 0;
             DownloadBytesMutex.ReleaseMutex();
         }
 
-        public static async Task resetUploadBytes()
+        public async Task resetUploadBytes()
         {
             UploadBytesMutex.WaitOne();
             bytesUploaded = 0;
             UploadBytesMutex.ReleaseMutex();
         }
 
-        public static void setDownloadSpeed(String speed)
+        public void setDownloadSpeed(String speed)
         {
             downloadSpeed = speed;
             TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
 
-        public static void setUploadSpeed(String speed)
+        public void setUploadSpeed(String speed)
         {
             uploadSpeed = speed;
             TaskEventChanged.Invoke(null, EventArgs.Empty);
diff --git a/TelegramDownloader/Shared/MainLayout.razor b/TelegramDownloader/Shared/MainLayout.razor
index c72f9bf..9a7a604 100644
--- a/TelegramDownloader/Shared/MainLayout.razor
+++ b/TelegramDownloader/Shared/MainLayout.razor
@@ -41,13 +41,13 @@
                 {
                     <button class="btn btn-primary download-button" @onclick='() => Navigateto("/downloads")'>
                         <Icon Class="arrow" Name="IconName.ArrowUp"></Icon>
-                        <span>@TransactionInfoService.uploadSpeed</span>
+                        <span>@tis.uploadSpeed</span>
                     </button>
                 }
                 @if(tis.isDownloading()) {
                     <button class="btn btn-primary download-button" @onclick='() => Navigateto("/downloads")'>
                         <Icon Class="arrow" Name="IconName.ArrowDown"></Icon>
-                        <span>@TransactionInfoService.downloadSpeed</span>
+                        <span>@tis.downloadSpeed</span>
                     </button>
                 }
                 <Button Color="ButtonColor.None" Size="ButtonSize.Small" @onclick='() => Navigateto("/downloads")'>
@@ -115,7 +115,7 @@
     protected override async Task OnInitializedAsync()
     {
         checkWorkingTasks();
-        TransactionInfoService.TaskEventChanged += eventChangedWorkingTasks;
+        tis.TaskEventChanged += eventChangedWorkingTasks;
     }
 
     private async Task reloadMenu()

From 687a23bc09f1ba60a66895f081c58b7ce2caaa43 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Thu, 20 Feb 2025 18:10:10 +0100
Subject: [PATCH 29/32] chore: solve start timer

---
 TelegramDownloader/Data/FileService.cs        |  1 +
 TelegramDownloader/Models/DownloadModel.cs    | 12 ++++--------
 .../Services/TransactionInfoService.cs        | 19 +++++++++++++++----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index d41ddbc..4474a2d 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -1225,6 +1225,7 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                     BsonFileManagerModel model = new BsonFileManagerModel();
                     if (file.IsFile)
                     {
+                        _tis.startTimer();
                         if (idt.executed > idt.currentUpload)
                         {
                             idt.currentUpload++;
diff --git a/TelegramDownloader/Models/DownloadModel.cs b/TelegramDownloader/Models/DownloadModel.cs
index c90d542..c1dcd32 100644
--- a/TelegramDownloader/Models/DownloadModel.cs
+++ b/TelegramDownloader/Models/DownloadModel.cs
@@ -128,7 +128,7 @@ public class DownloadModel
         public Callbacks callbacks { get; set; }
 
         public long _size { get; set; }
-        public long _transmitted {  get; set; }
+        public long _transmitted { get; set; } = 0;
 
         public string _sizeString { get; set; }
         public string _transmittedString { get; set; }
@@ -136,7 +136,6 @@ public class DownloadModel
         public IPeerInfo channel { get; set; }
         public string channelName { get; set; }
         public int progress { get; set; }
-        public long accumulatedSize { get; set; } = 0;
         public TransactionInfoService tis { get; set; }
 
 
@@ -157,8 +156,7 @@ public void ProgressCallback(long transmitted, long totalSize)
                 tis.deleteDownloadInList(this);
                 throw new Exception($"Paused {name}");
             }
-            tis.addDownloadBytes(transmitted - accumulatedSize);
-            accumulatedSize = transmitted;
+            tis.addDownloadBytes(transmitted - _transmitted);
             _transmitted = transmitted;
             _sizeString = HelperService.SizeSuffix(totalSize);
             _transmittedString = HelperService.SizeSuffix(transmitted);
@@ -204,7 +202,7 @@ public class UploadModel
         public string path { get; set; }
 
         public long _size { get; set; }
-        public long _transmitted { get; set; }
+        public long _transmitted { get; set; } = 0;
 
         public string _sizeString { get; set; }
         public string _transmittedString { get; set; }
@@ -212,15 +210,13 @@ public class UploadModel
         public IPeerInfo channel { get; set; }
         public int progress { get; set; }
         public Thread thread { get; set; }
-        public long accumulatedSize { get; set; } = 0;
         public TransactionInfoService tis { get; set; }
 
         public virtual void ProgressCallback(long transmitted, long totalSize)
         {
             if (state == StateTask.Canceled)
                 throw new Exception($"Canceled {name}");
-            tis.addUploadBytes(transmitted - accumulatedSize);
-            accumulatedSize = transmitted;
+            tis.addUploadBytes(transmitted - _transmitted);
             _transmitted = transmitted;
             _sizeString = HelperService.SizeSuffix(totalSize);
             _transmittedString = HelperService.SizeSuffix(transmitted);
diff --git a/TelegramDownloader/Services/TransactionInfoService.cs b/TelegramDownloader/Services/TransactionInfoService.cs
index ada58ba..cf29a67 100644
--- a/TelegramDownloader/Services/TransactionInfoService.cs
+++ b/TelegramDownloader/Services/TransactionInfoService.cs
@@ -1,4 +1,5 @@
 using System.Timers;
+using TelegramDownloader.Data;
 using TelegramDownloader.Models;
 using TelegramDownloader.Pages.Modals;
 using TL;
@@ -8,7 +9,7 @@ namespace TelegramDownloader.Services
 {
     public class TransactionInfoService
     {
-        private Timer aTimer;
+        
 
         public bool isPauseDownloads = false;
         public event EventHandler<EventArgs> EventChanged;
@@ -27,6 +28,13 @@ public class TransactionInfoService
         private static Mutex DownloadBytesMutex = new Mutex();
         private static Mutex UploadBytesMutex = new Mutex();
 
+        private Timer aTimer;
+        private readonly ILogger<IFileService> _logger;
+
+        public TransactionInfoService(ILogger<IFileService> logger)
+        {
+            _logger = logger;
+        }
         public bool isWorking()
         {
             if (!(downloadModels.Where(x => x.state == StateTask.Working).Count() > 0
@@ -76,7 +84,8 @@ public void stopTimer()
 
         private void OnTimedEvent(Object source, ElapsedEventArgs e)
         {
-            Console.WriteLine("El evento Elapsed se disparó a las {0:HH:mm:ss.fff}", e.SignalTime);
+            _logger.LogInformation("El evento Elapsed se disparó a las {0:HH:mm:ss.fff}", e.SignalTime);
+            _logger.LogInformation("Upload: {0}, download: {1}", bytesUploaded, bytesDownloaded);
             if (bytesDownloaded > 0)
                 setDownloadSpeed(HelperService.SizeSuffixPerTime(bytesDownloaded));
             if (bytesUploaded > 0)
@@ -93,6 +102,7 @@ public async Task addDownloadBytes(long bytes)
 
         public async Task addUploadBytes(long bytes)
         {
+            _logger.LogInformation("Add bytes to upload {0}", bytes);
             UploadBytesMutex.WaitOne();
             bytesUploaded += bytes;
             UploadBytesMutex.ReleaseMutex();
@@ -120,6 +130,7 @@ public void setDownloadSpeed(String speed)
 
         public void setUploadSpeed(String speed)
         {
+            _logger.LogInformation("Set bytes speed upload {0}", speed);
             uploadSpeed = speed;
             TaskEventChanged.Invoke(null, EventArgs.Empty);
         }
@@ -189,8 +200,8 @@ public async Task CheckPendingDownloads()
                 DownloadModel dm = pendingDownloadModels.FirstOrDefault();
                 downloadModels.Insert(0, dm);
                 pendingDownloadModels.Remove(dm);
-                dm.RetryCallback();
                 startTimer();
+                dm.RetryCallback();
             }
             PendingDownloadMutex.ReleaseMutex();
             EventChanged?.Invoke(this, new EventArgs());
@@ -205,8 +216,8 @@ public async Task CheckPendingUploadInfoTasks()
             {
                 InfoDownloadTaksModel idt = infoDownloadTaksModel.Where(x => x.state == StateTask.Pending).OrderBy(x => x.creationDate).FirstOrDefault();
                 idt.state = StateTask.Working;
-                idt.RetryCallback();
                 startTimer();
+                idt.RetryCallback();
             }
             PendingUploadInfoTaskMutex.ReleaseMutex();
             EventChanged?.Invoke(this, new EventArgs());

From 7fb1fc39b69f368241b4bc860a70812215c20f44 Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Thu, 20 Feb 2025 18:20:50 +0100
Subject: [PATCH 30/32] chore: solve timer problem

---
 TelegramDownloader/Data/FileService.cs                | 1 -
 TelegramDownloader/Services/TransactionInfoService.cs | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index 4474a2d..d41ddbc 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -1225,7 +1225,6 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                     BsonFileManagerModel model = new BsonFileManagerModel();
                     if (file.IsFile)
                     {
-                        _tis.startTimer();
                         if (idt.executed > idt.currentUpload)
                         {
                             idt.currentUpload++;
diff --git a/TelegramDownloader/Services/TransactionInfoService.cs b/TelegramDownloader/Services/TransactionInfoService.cs
index cf29a67..30f7739 100644
--- a/TelegramDownloader/Services/TransactionInfoService.cs
+++ b/TelegramDownloader/Services/TransactionInfoService.cs
@@ -43,6 +43,7 @@ public bool isWorking()
                 stopTimer();
                 return false;
             }
+            startTimer();
             return true;
         }
 

From f6884d91df89c8b0da5d9ff1228a6fcf1345725c Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Thu, 20 Feb 2025 18:30:07 +0100
Subject: [PATCH 31/32] chore: reset upload bytes

---
 TelegramDownloader/Services/TransactionInfoService.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TelegramDownloader/Services/TransactionInfoService.cs b/TelegramDownloader/Services/TransactionInfoService.cs
index 30f7739..73cede0 100644
--- a/TelegramDownloader/Services/TransactionInfoService.cs
+++ b/TelegramDownloader/Services/TransactionInfoService.cs
@@ -92,6 +92,7 @@ private void OnTimedEvent(Object source, ElapsedEventArgs e)
             if (bytesUploaded > 0)
                 setUploadSpeed(HelperService.SizeSuffixPerTime(bytesUploaded));
             resetDownloadBytes();
+            resetUploadBytes();
         }
 
         public async Task addDownloadBytes(long bytes)

From 9d8e3cb00311cff461db82aef1a919ee82c5a9cf Mon Sep 17 00:00:00 2001
From: mateofuentespombo <mateof@gmail.com>
Date: Mon, 24 Feb 2025 19:11:19 +0100
Subject: [PATCH 32/32] feat: add relative path to caption

---
 TelegramDownloader/Data/FileService.cs      |  17 ++-
 TelegramDownloader/Data/ITelegramService.cs |   2 +-
 TelegramDownloader/Data/TelegramService.cs  |   4 +-
 TelegramDownloader/Models/GeneralConfig.cs  |   1 +
 TelegramDownloader/Pages/Config.razor       | 122 +++++++++++---------
 5 files changed, 84 insertions(+), 62 deletions(-)

diff --git a/TelegramDownloader/Data/FileService.cs b/TelegramDownloader/Data/FileService.cs
index d41ddbc..eae4b4a 100644
--- a/TelegramDownloader/Data/FileService.cs
+++ b/TelegramDownloader/Data/FileService.cs
@@ -1270,7 +1270,7 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                                     {
                                         wt = new WaitingTime();
                                         using (FileStream fs = new FileStream(s, FileMode.Open, FileAccess.Read, FileShare.Read))
-                                            m = await _ts.uploadFile(dbName, fs, $"({i} of {filesSplit.Count}) - " + file.Name, um: um);
+                                            m = await _ts.uploadFile(dbName, fs, $"({i} of {filesSplit.Count}) - " + file.Name, um: um, caption: getCaption(filePath));
                                         attempts = 0;
                                         await wt.Sleep(); // sleep 1 second to avoid 420 flood_wait_x
                                     }
@@ -1324,17 +1324,17 @@ public async Task UploadFileFromServer(string dbName, string currentPath, List<S
                                         using (FileStream ms = new FileStream(System.IO.Path.Combine(currentFilePath), FileMode.Open))
                                             if (ImageExtensions.Any(x => file.Name.ToUpper().EndsWith(x)) && file.Size >= MAXIMAGESIZE)
                                             {
-                                                m = await _ts.uploadFile(dbName, ms, file.Name, "application/octet-stream", um);
+                                                m = await _ts.uploadFile(dbName, ms, file.Name, "application/octet-stream", um, caption: getCaption(filePath));
                                             }
                                             else
-                                                m = await _ts.uploadFile(dbName, ms, file.Name, um: um);
+                                                m = await _ts.uploadFile(dbName, ms, file.Name, um: um, caption: getCaption(filePath));
                                     }
                                     catch (Exception ex)
                                     {
                                         if (new List<string> { "IMAGE", "PHOTO" }.Any(x => ex.Message.Contains(x)))
                                         {
                                             using (FileStream ms = new FileStream(System.IO.Path.Combine(currentFilePath), FileMode.Open))
-                                                m = await _ts.uploadFile(dbName, ms, file.Name, "application/octet-stream", um);
+                                                m = await _ts.uploadFile(dbName, ms, file.Name, "application/octet-stream", um, caption: getCaption(filePath));
                                         }
                                         else
                                         {
@@ -1515,7 +1515,7 @@ public async Task UploadFile(string dbName, string currentPath, UploadFiles file
                     foreach (string s in files)
                     {
                         using (FileStream fs = new FileStream(s, FileMode.Open, FileAccess.Read, FileShare.Read))
-                            m = await _ts.uploadFile(dbName, fs, $"({i} of {files.Count}) - " + file.File.Name);
+                            m = await _ts.uploadFile(dbName, fs, $"({i} of {files.Count}) - " + file.File.Name, caption: getCaption(currentPath));
                         model.ListMessageId.Add(m.ID);
                         File.Delete(s);
                         i++;
@@ -1526,7 +1526,7 @@ public async Task UploadFile(string dbName, string currentPath, UploadFiles file
                 {
                     using (FileStream ms = new FileStream(System.IO.Path.Combine(currentFilePath, file.File.Name), FileMode.Open))
                     {
-                        m = await _ts.uploadFile(dbName, ms, file.File.Name);
+                        m = await _ts.uploadFile(dbName, ms, file.File.Name, caption: getCaption(currentPath));
                     }
                     model.MessageId = m.ID;
                 }
@@ -1758,6 +1758,11 @@ private async Task<List<ExpandoObject>> AddChildRecords(string id, string parent
             return response;
         }
 
+        private string? getCaption(string filePath)
+        {
+            return GeneralConfigStatic.config.ShouldShowCaptionPath ? filePath : null;
+        }
+
         private async Task<MemoryStream> ToMemoryStreamAsync(Stream stream)
         {
             var memoryStream = new MemoryStream();
diff --git a/TelegramDownloader/Data/ITelegramService.cs b/TelegramDownloader/Data/ITelegramService.cs
index 7b376fc..f636d87 100644
--- a/TelegramDownloader/Data/ITelegramService.cs
+++ b/TelegramDownloader/Data/ITelegramService.cs
@@ -29,7 +29,7 @@ public interface ITelegramService
         Task<string> getPhotoThumb(ChatBase chat);
         Task logOff();
         Task sendVerificationCode(string vc);
-        Task<Message> uploadFile(string chatId, Stream file, string fileName, string mimeType = null, UploadModel um = null);
+        Task<Message> uploadFile(string chatId, Stream file, string fileName, string mimeType = null, UploadModel um = null, string caption = null);
 
     }
 }
\ No newline at end of file
diff --git a/TelegramDownloader/Data/TelegramService.cs b/TelegramDownloader/Data/TelegramService.cs
index d7d7adc..a500e8c 100644
--- a/TelegramDownloader/Data/TelegramService.cs
+++ b/TelegramDownloader/Data/TelegramService.cs
@@ -282,7 +282,7 @@ public async Task<List<ChatViewBase>> getAllSavedChats()
             return allChats;
         }
 
-        public async Task<Message> uploadFile(string chatId, Stream file, string fileName, string mimeType = null, UploadModel um = null)
+        public async Task<Message> uploadFile(string chatId, Stream file, string fileName, string mimeType = null, UploadModel um = null, string caption = null)
         {
             um = um ?? new UploadModel();
             um.tis = _tis;
@@ -293,7 +293,7 @@ public async Task<Message> uploadFile(string chatId, Stream file, string fileNam
             um._transmitted = 0;
             _tis.addToUploadList(um);
             var inputFile = await client.UploadFileAsync(file, fileName, um.ProgressCallback);
-            return await client.SendMediaAsync(peer, fileName, inputFile, mimeType);
+            return await client.SendMediaAsync(peer, caption ?? fileName, inputFile, mimeType);
         }
 
         public async Task deleteFile(string chatId, int idMessage)
diff --git a/TelegramDownloader/Models/GeneralConfig.cs b/TelegramDownloader/Models/GeneralConfig.cs
index c327c62..4bd4374 100644
--- a/TelegramDownloader/Models/GeneralConfig.cs
+++ b/TelegramDownloader/Models/GeneralConfig.cs
@@ -72,6 +72,7 @@ public class GeneralConfig
         public int SplitSize { get; set; } = 0;
         public int MaxSimultaneousDownloads = 1;
         public bool CheckHash { get; set; } = false;
+        public bool ShouldShowCaptionPath { get; set; } = false;
         public bool ShouldShowLogInTerminal { get; set; } = false;
         public List<long> FavouriteChannels { get; set; } = new List<long>();
         
diff --git a/TelegramDownloader/Pages/Config.razor b/TelegramDownloader/Pages/Config.razor
index d06ad06..cc7986c 100644
--- a/TelegramDownloader/Pages/Config.razor
+++ b/TelegramDownloader/Pages/Config.razor
@@ -10,76 +10,92 @@
 <h3>Config</h3>
 @if(Model != null)
 {
-    <EditForm Model="Model" OnValidSubmit="Submit">
-        <AntiforgeryToken />
-        <div>
-            <div class="input-group mb-3">
-            <span class="input-group-text"><i class="bi bi-hourglass-split"></i></span>
-                <div class="form-floating">
-                    <InputNumber type="number" @bind-Value="Model!.TimeSleepBetweenTransactions"  class="form-control" id="TimeSleepBetweenTransactions" placeholder="Sleep Time (ms)"/>
-                    <label for="TimeSleepBetweenTransactions">Sleep Time(ms)</label>
+    <div class="card text-dark bg-light mb-2" style="max-width: 45rem;">
+        <div class="card-header">Configuration</div>
+        <div class="card-body">
+            <EditForm Model="Model" OnValidSubmit="Submit">
+                <AntiforgeryToken />
+                <div>
+                    <div class="input-group mb-3">
+                        <span class="input-group-text"><i class="bi bi-hourglass-split"></i></span>
+                        <div class="form-floating">
+                            <InputNumber type="number" @bind-Value="Model!.TimeSleepBetweenTransactions" class="form-control" id="TimeSleepBetweenTransactions" placeholder="Sleep Time (ms)" />
+                            <label for="TimeSleepBetweenTransactions">Sleep Time(ms)</label>
+                        </div>
+
+                    </div>
                 </div>
-            
-            </div>
-        </div>
 
-        <div>
-            <div class="input-group mb-3">
-                <span class="input-group-text"><i class="bi bi-download"></i></span>
-                <div class="form-floating">
-                    <NumberInput TValue="int" @bind-Value="Model!.MaxSimultaneousDownloads" Min="1" Max="3" EnableMinMax="true" class="form-control" id="MaxSimultaneousDownloads" placeholder="Sleep Time (ms)" />
-                    <label for="MaxSimultaneousDownloads">Max. Simultaneous Downloads</label>
+                <div>
+                    <div class="input-group mb-3">
+                        <span class="input-group-text"><i class="bi bi-download"></i></span>
+                        <div class="form-floating">
+                            <NumberInput TValue="int" @bind-Value="Model!.MaxSimultaneousDownloads" Min="1" Max="3" EnableMinMax="true" class="form-control" id="MaxSimultaneousDownloads" placeholder="Sleep Time (ms)" />
+                            <label for="MaxSimultaneousDownloads">Max. Simultaneous Downloads</label>
+                        </div>
+
+                    </div>
                 </div>
 
-            </div>
-        </div>
+                <div>
+                    <div class="form-check form-switch">
+                        <InputCheckbox @bind-Value="Model!.CheckHash" class="form-check-input" type="checkbox" id="CheckHash" />
+                        <label class="form-check-label" for="ShouldShowNotifications">Check Hash</label>
+                    </div>
 
-        <div>
-            <div class="form-check form-switch">
-                <InputCheckbox @bind-Value="Model!.CheckHash" class="form-check-input" type="checkbox" id="CheckHash" />
-                <label class="form-check-label" for="ShouldShowNotifications">Check Hash</label>
-            </div>
 
+                </div>
 
-        </div>
+                <div>
+                    <div class="form-check form-switch">
+                        <InputCheckbox @bind-Value="Model!.ShouldNotify" class="form-check-input" type="checkbox" id="ShouldShowNotifications" />
+                        <label class="form-check-label" for="ShouldShowNotifications">Should show Notifications</label>
+                    </div>
 
-        <div>
-            <div class="form-check form-switch">
-                <InputCheckbox @bind-Value="Model!.ShouldNotify" class="form-check-input" type="checkbox" id="ShouldShowNotifications" />
-                <label class="form-check-label" for="ShouldShowNotifications">Should show Notifications</label>
-            </div>
 
+                </div>
 
-        </div>
+                <div>
+                    <div class="form-check form-switch">
+                        <InputCheckbox @bind-Value="Model!.ShouldShowLogInTerminal" class="form-check-input" type="checkbox" id="ShouldShowLogInTerminal" />
+                        <label class="form-check-label" for="ShouldShowLogInTerminal">Should show log in terminal</label>
+                    </div>
+                </div>
+
+                <div>
+                    <div class="form-check form-switch">
+                        <InputCheckbox @bind-Value="Model!.ShouldShowCaptionPath" class="form-check-input" type="checkbox" id="CheckHash" />
+                        <label class="form-check-label" for="ShouldShowCaptionPath">Should show caption relative path</label>
+                    </div>
 
-        <div>
-            <div class="form-check form-switch">
-                <InputCheckbox @bind-Value="Model!.ShouldShowLogInTerminal" class="form-check-input" type="checkbox" id="ShouldShowLogInTerminal" />
-                <label class="form-check-label" for="ShouldShowLogInTerminal">Should show log in terminal</label>
-            </div>
-        </div>
 
+                </div>
 
-        <div>
-            <div class="d-flex flex-row mb-3">
-                @if(TelegramService.isPremium)
-                {
-                    <RangeInput TValue="int" Id="splitsize" @bind-Value="Model.SplitSize" Min="0" Max="4" />
-                } else
-                {
-                    <RangeInput TValue="int" @bind-Value="Model.SplitSize" Min="0" Max="2" />
-                }
-                <Badge Color="BadgeColor.Primary" Class="ms-2" VisuallyHiddenText="splitsize">@Model.SplitSize</Badge>
 
-                <label class="form-check-label" for="splitsize">Split in GB</label>
-            </div>
+                <div>
+                    <div class="d-flex flex-row mb-3">
+                        @if (TelegramService.isPremium)
+                        {
+                            <RangeInput TValue="int" Id="splitsize" @bind-Value="Model.SplitSize" Min="0" Max="4" />
+                        }
+                        else
+                        {
+                            <RangeInput TValue="int" @bind-Value="Model.SplitSize" Min="0" Max="2" />
+                        }
+                        <Badge Color="BadgeColor.Primary" Class="ms-2" VisuallyHiddenText="splitsize">@Model.SplitSize</Badge>
 
+                        <label class="form-check-label" for="splitsize">Split in GB</label>
+                    </div>
 
+
+                </div>
+                <div>
+                    <button class="btn btn-info" type="submit">Save</button>
+                </div>
+            </EditForm>
         </div>
-        <div>
-            <button class="btn btn-info" type="submit">Save</button>
-        </div>
-    </EditForm>
+    </div>
+    
 }
 
 @code {