Merge branch 'develop' of https://github.com/mateof/TelegramFileManager into develop

Author: mateof

TelegramDownloader/Models/DownloadModel.cs

@@ -128,15 +128,14 @@ 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 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,23 +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 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);

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
@@ -35,6 +43,7 @@ public bool isWorking()
                 stopTimer();
                 return false;
             }
+            startTimer();
             return true;
         }
 
@@ -76,12 +85,14 @@ 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)
                 setUploadSpeed(HelperService.SizeSuffixPerTime(bytesUploaded));
             resetDownloadBytes();
+            resetUploadBytes();
         }
 
         public async Task addDownloadBytes(long bytes)
@@ -93,6 +104,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 +132,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 +202,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 +218,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());