release: v2.0.6

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);

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
@@ -1264,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
                                     }
@@ -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
@@ -1317,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
                                         {
@@ -1508,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++;
@@ -1519,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;
                 }
@@ -1751,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();

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);
 
     }
 }

TelegramDownloader/Data/TelegramService.cs

@@ -282,17 +282,18 @@ 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;
 
             InputPeer peer = chats.chats[Convert.ToInt64(chatId)];
             um.name = fileName;
             um._size = file.Length;
             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)
@@ -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;
 

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();
         }
 
@@ -119,6 +117,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";
@@ -129,14 +128,16 @@ 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; }
 
         public IPeerInfo channel { get; set; }
         public string channelName { get; set; }
         public int progress { get; set; }
+        public TransactionInfoService tis { get; set; }
+
 
         public DownloadModel(string? name = null)
         {
@@ -150,11 +151,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}");
             }
+            tis.addDownloadBytes(transmitted - _transmitted);
             _transmitted = transmitted;
             _sizeString = HelperService.SizeSuffix(totalSize);
             _transmittedString = HelperService.SizeSuffix(transmitted);
@@ -165,7 +167,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();
             }
 
@@ -174,7 +175,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());
         }
@@ -202,19 +202,21 @@ 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; }
         public string chatName { get; set; }
         public IPeerInfo channel { get; set; }
         public int progress { get; set; }
         public Thread thread { get; set; }
+        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 - _transmitted);
             _transmitted = transmitted;
             _sizeString = HelperService.SizeSuffix(totalSize);
             _transmittedString = HelperService.SizeSuffix(transmitted);

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>();