CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 19:20:27 +12:00
Code Issues Packages Projects Releases Wiki Activity

Use GetHistoryItemsAsync

Browse source
This commit is contained in:
Jaex 2022-01-01 01:36:47 +03:00
parent 091abd5c45
commit eaee359cb1
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
ShareX.HistoryLib/Forms/HistoryForm.cs
View file

@ -30,6 +30,7 @@
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace ShareX.HistoryLib namespace ShareX.HistoryLib
@ -120,9 +121,10 @@ private void ResetFilters()
cbHostFilterSelection.ResetText(); cbHostFilterSelection.ResetText();
} }
private void RefreshHistoryItems(bool mockData = false) private async Task RefreshHistoryItems(bool mockData = false)
{ {
allHistoryItems = GetHistoryItems(mockData); allHistoryItems = await GetHistoryItems(mockData);
ApplyFilterSimple(); ApplyFilterSimple();
cbTypeFilterSelection.Items.Clear(); cbTypeFilterSelection.Items.Clear();
@ -143,7 +145,7 @@ private HistoryItem[] him_GetHistoryItems()
return lvHistory.SelectedIndices.Cast<int>().Select(i => filteredHistoryItems[i]).ToArray(); return lvHistory.SelectedIndices.Cast<int>().Select(i => filteredHistoryItems[i]).ToArray();
} }
private HistoryItem[] GetHistoryItems(bool mockData = false) private async Task<HistoryItem[]> GetHistoryItems(bool mockData = false)
{ {
HistoryManager history; HistoryManager history;
@ -156,7 +158,7 @@ private HistoryItem[] GetHistoryItems(bool mockData = false)
history = new HistoryManagerJSON(HistoryPath); history = new HistoryManagerJSON(HistoryPath);
} }
List<HistoryItem> historyItems = history.GetHistoryItems(); List<HistoryItem> historyItems = await history.GetHistoryItemsAsync();
historyItems.Reverse(); historyItems.Reverse();
return historyItems.ToArray(); return historyItems.ToArray();
} }
@ -380,11 +382,11 @@ private string OutputStats(HistoryItem[] historyItems)
#region Form events #region Form events
private void HistoryForm_Shown(object sender, EventArgs e) private async void HistoryForm_Shown(object sender, EventArgs e)
{ {
Refresh();
RefreshHistoryItems();
this.ForceActivate(); this.ForceActivate();
await RefreshHistoryItems();
} }
private void HistoryForm_Resize(object sender, EventArgs e) private void HistoryForm_Resize(object sender, EventArgs e)
@ -401,17 +403,17 @@ private void HistoryForm_FormClosing(object sender, FormClosingEventArgs e)
} }
} }
private void HistoryForm_KeyDown(object sender, KeyEventArgs e) private async void HistoryForm_KeyDown(object sender, KeyEventArgs e)
{ {
switch (e.KeyData) switch (e.KeyData)
{ {
case Keys.F5: case Keys.F5:
RefreshHistoryItems();
e.Handled = true; e.Handled = true;
await RefreshHistoryItems();
break; break;
case Keys.Control | Keys.F5 when HelpersOptions.DevMode: case Keys.Control | Keys.F5 when HelpersOptions.DevMode:
RefreshHistoryItems(true);
e.Handled = true; e.Handled = true;
await RefreshHistoryItems(true);
break; break;
} }
} }

6
ShareX.HistoryLib/HistoryManager.cs
View file

@ -29,6 +29,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace ShareX.HistoryLib namespace ShareX.HistoryLib
@ -62,6 +63,11 @@ public List<HistoryItem> GetHistoryItems()
return new List<HistoryItem>(); return new List<HistoryItem>();
} }
public async Task<List<HistoryItem>> GetHistoryItemsAsync()
{
return await Task.Run(() => GetHistoryItems());
}
public bool AppendHistoryItem(HistoryItem historyItem) public bool AppendHistoryItem(HistoryItem historyItem)
{ {
return AppendHistoryItems(new HistoryItem[] { historyItem }); return AppendHistoryItems(new HistoryItem[] { historyItem });