merge: Develop into main (#19)

mateof · web-flow · commit 8015bae6eefd · 2024-12-30T23:49:17.000+01:00
* 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
diff --git 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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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/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();
 
diff --git 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
@@ -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
@@ -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
@@ -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/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/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();
diff --git 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>

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ public async Task<IActionResult> Upload([FromForm] string path, IFormFile file,`
`208`	`208`	`this.operation.RootFolder(Path.Combine(basePath, root));`
`209`	`209`	`FileManagerResponse uploadResponse;`
`210`	`210`
`211`		`- uploadResponse = operation.Upload(Path.Combine(basePath, root, path), lfile, action, null);`
	`211`	`+ uploadResponse = operation.Upload(Path.Combine(basePath, root, path), lfile, action, 0, null);`
`212`	`212`	`if (uploadResponse.Error != null)`
`213`	`213`	`{`
`214`	`214`	`Response.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ public async Task<IActionResult> Upload([FromForm] string path, IFormFile file,`
`220`	`220`	`this.operation.RootFolder(Path.Combine(basePath, root, id.ToString()));`
`221`	`221`	`FileManagerResponse uploadResponse;`
`222`	`222`
`223`		`- uploadResponse = operation.Upload(Path.Combine(basePath, root, path), lfile, action, null);`
	`223`	`+ uploadResponse = operation.Upload(Path.Combine(basePath, root, path), lfile, action, 0, null);`
`224`	`224`	`if (uploadResponse.Error != null)`
`225`	`225`	`{`
`226`	`226`	`Response.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@`
`57`	`57`	`private FilesAndCount getLogs(int pageNumber, int pageSize)`
`58`	`58`	`{`
`59`	`59`	`FilesAndCount fac = new FilesAndCount();`
`60`		`- List<string> totalLogs = Directory.GetFiles(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "logs")).ToList();`
	`60`	`+ List<string> totalLogs = Directory.GetFiles(Path.Combine(Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location) ?? AppDomain.CurrentDomain.BaseDirectory, "logs")).ToList();`
`61`	`61`	`totalLogs.Reverse();`
`62`	`62`	`fac.totalFiles = totalLogs.Count();`
`63`	`63`