CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

Rename upload duration to task duration

Browse source
This commit is contained in:
Jaex 2016-05-30 14:21:31 +03:00
parent f8d4eb2220
commit d941ec0cf5
4 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ShareX/TaskInfo.cs
View file

@ -27,6 +27,7 @@ You should have received a copy of the GNU General Public License
using ShareX.HistoryLib;
using ShareX.UploadersLib;
using System;
using System.Diagnostics;
using System.IO;
namespace ShareX
@ -126,14 +127,14 @@ public string UploaderHost
}
}
public DateTime StartTime { get; set; }
public DateTime UploadTime { get; set; }
public DateTime TaskStartTime { get; set; }
public DateTime TaskEndTime { get; set; }
public TimeSpan UploadDuration
public TimeSpan TaskDuration
{
get
{
return UploadTime - StartTime;
return TaskEndTime - TaskStartTime;
}
}
@ -168,7 +169,7 @@ public HistoryItem GetHistoryItem()
{
Filename = FileName,
Filepath = FilePath,
DateTime = UploadTime,
DateTime = TaskEndTime,
Type = DataType.ToString(),
Host = UploaderHost,
URL = Result.URL,

4
ShareX/TaskManager.cs
View file

@ -184,7 +184,7 @@ private static void CreateListViewItem(WorkerTask task)
if (task.Status == TaskStatus.History)
{
lvi.SubItems.Add(Resources.TaskManager_CreateListViewItem_History);
lvi.SubItems.Add(task.Info.UploadTime.ToString());
lvi.SubItems.Add(task.Info.TaskEndTime.ToString());
}
else
{
@ -318,7 +318,7 @@ private static void task_TaskCompleted(WorkerTask task)
}
else
{
DebugHelper.WriteLine("Task completed. Filename: {0}, URL: {1}, Duration: {2} ms", info.FileName, info.Result.ToString(), (int)info.UploadDuration.TotalMilliseconds);
DebugHelper.WriteLine($"Task completed. Filename: {info.FileName}, URL: {info.Result}, Duration: {info.TaskDuration.TotalMilliseconds:d} ms");
string result = info.Result.ToString();

2
ShareX/UploadInfoParser.cs
View file

@ -69,7 +69,7 @@ public string Parse(TaskInfo info, string pattern)
pattern = pattern.Replace("$thumbnailfilenamenoext", !string.IsNullOrEmpty(info.ThumbnailFilePath) ? Path.GetFileNameWithoutExtension(info.ThumbnailFilePath) : "");
pattern = pattern.Replace("$thumbnailfilename", !string.IsNullOrEmpty(info.ThumbnailFilePath) ? Path.GetFileName(info.ThumbnailFilePath) : "");
pattern = pattern.Replace("$uploadtime", ((int)info.UploadDuration.TotalMilliseconds).ToString());
pattern = pattern.Replace("$uploadtime", ((int)info.TaskDuration.TotalMilliseconds).ToString());
}
return pattern;

6
ShareX/WorkerTask.cs
View file

@ -100,7 +100,7 @@ public static WorkerTask CreateHistoryTask(RecentTask recentTask)
task.Info.Result.ThumbnailURL = recentTask.ThumbnailURL;
task.Info.Result.DeletionURL = recentTask.DeletionURL;
task.Info.Result.ShortenedURL = recentTask.ShortenedURL;
task.Info.UploadTime = recentTask.Time.ToLocalTime();
task.Info.TaskEndTime = recentTask.Time.ToLocalTime();
return task;
}
@ -302,7 +302,7 @@ public void Stop()
private void ThreadDoWork()
{
Info.StartTime = DateTime.UtcNow;
Info.TaskStartTime = DateTime.UtcNow;
CreateTaskReferenceHelper();
@ -344,7 +344,7 @@ private void ThreadDoWork()
}
}
Info.UploadTime = DateTime.UtcNow;
Info.TaskEndTime = DateTime.UtcNow;
}
private void CreateTaskReferenceHelper()