Skip to content

Avoid favorite sidebar constant reloading #9065

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 2, 2022
Merged

Avoid favorite sidebar constant reloading #9065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0dd67f
Avoid favorite sidebar constant reloading
gave92 May 1, 2022
88f8991
Use correct config file
gave92 May 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 25 additions & 3 deletions src/Files.Uwp/Controllers/SidebarPinnedController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public class SidebarPinnedController : IJson

private bool suppressChangeEvent;

private string configContent;

public string JsonFileName { get; } = "PinnedItems.json";

private string folderPath => Path.Combine(ApplicationData.Current.LocalFolder.Path, "settings");
Expand Down Expand Up @@ -90,7 +92,8 @@ private async Task LoadAsync()

try
{
Model = JsonConvert.DeserializeObject<SidebarPinnedModel>(await FileIO.ReadTextAsync(JsonFile.Result));
configContent = await FileIO.ReadTextAsync(JsonFile.Result);
Model = JsonConvert.DeserializeObject<SidebarPinnedModel>(configContent);
if (Model == null)
{
throw new ArgumentException($"{JsonFileName} is empty, regenerating...");
Expand Down Expand Up @@ -127,8 +130,27 @@ private async void Query_ContentsChanged(IStorageQueryResultBase sender, object
return;
}

// Watched file changed externally, reload the sidebar items
await ReloadAsync();
try
{
var configFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appdata:///local/settings/PinnedItems.json"));
var content = await FileIO.ReadTextAsync(configFile);

if (configContent != content)
{
configContent = content;
}
else
{
return;
}

// Watched file changed externally, reload the sidebar items
await ReloadAsync();
}
catch
{
// ignored
}
}

public void SaveModel()
Expand Down
13 changes: 7 additions & 6 deletions src/Files.Uwp/Controllers/TerminalController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,8 @@ private async Task LoadAsync()

try
{
var content = await FileIO.ReadTextAsync(JsonFile.Result);
configContent = content;
Model = JsonConvert.DeserializeObject<TerminalFileModel>(content);
configContent = await FileIO.ReadTextAsync(JsonFile.Result);
Model = JsonConvert.DeserializeObject<TerminalFileModel>(configContent);
if (Model == null)
{
throw new ArgumentException($"{JsonFileName} is empty, regenerating...");
Expand All @@ -93,9 +92,11 @@ private async Task LoadAsync()

private async Task StartWatchConfigChangeAsync()
{
var configFile = await StorageFile.GetFileFromApplicationUriAsync(new Uri("ms-appdata:///local/settings/terminal.json"));
var folder = await configFile.GetParentAsync();
query = folder.CreateFileQuery();
var queryOptions = new QueryOptions();
queryOptions.ApplicationSearchFilter = "System.FileName:" + JsonFileName;

var settingsFolder = await ApplicationData.Current.LocalFolder.GetFolderAsync("settings");
query = settingsFolder.CreateFileQueryWithOptions(queryOptions);
query.ContentsChanged += Query_ContentsChanged;
await query.GetFilesAsync();
}
Expand Down