Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-02-23 19:49:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

few more errors knocked out

Browse Source
This commit is contained in:
Clint Rutkas
2024-09-04 15:36:35 -07:00
parent 14c8f79130
commit 0ec9bbb02f
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Bookmark/Bookmarks.cs
View File

@@ -17,7 +17,7 @@ public sealed class Bookmarks
public static Bookmarks ReadFromFile(string path)
{
Bookmarks data = null;
var data = new Bookmarks();
// if the file exists, load it and append the new item
if (File.Exists(path))
@@ -26,18 +26,17 @@ public sealed class Bookmarks
if (!string.IsNullOrEmpty(jsonStringReading))
{
data = JsonSerializer.Deserialize<Bookmarks>(jsonStringReading, _jsonOptions);
data = JsonSerializer.Deserialize<Bookmarks>(jsonStringReading, _jsonOptions) ?? new Bookmarks();
}
}
data ??= new Bookmarks();
return data;
}
public static void WriteToFile(string path, Bookmarks data)
{
var jsonString = JsonSerializer.Serialize<Bookmarks>(data, _jsonOptions);
var jsonString = JsonSerializer.Serialize(data, _jsonOptions);
File.WriteAllText(BookmarksActionProvider.StateJsonPath(), jsonString);
}
}

31
src/modules/cmdpal/src/WindowsCommandPalette/Builtins/Bookmark/BookmarksActionProvider.cs
View File

@@ -35,32 +35,37 @@ public class BookmarksActionProvider : ICommandProvider
{
List<ICommand> collected = [];
collected.Add(_addNewCommand);
try
{
var jsonFile = StateJsonPath();
if (File.Exists(jsonFile))
{
var data = Bookmarks.ReadFromFile(jsonFile);
if (data != null)
{
var items = data?.Data;
foreach (var item in items)
if (items != null)
{
var nameToken = item.Name;
var urlToken = item.Bookmark;
var typeToken = item.Type;
if (nameToken == null || urlToken == null || typeToken == null)
foreach (var item in items)
{
continue;
}
var nameToken = item.Name;
var urlToken = item.Bookmark;
var typeToken = item.Type;
var name = nameToken.ToString();
var url = urlToken.ToString();
var type = typeToken.ToString();
collected.Add((url.Contains('{') && url.Contains('}')) ? new BookmarkPlaceholderPage(name, url, type) : new UrlAction(name, url, type));
if (nameToken == null || urlToken == null || typeToken == null)
{
continue;
}
var name = nameToken.ToString();
var url = urlToken.ToString();
var type = typeToken.ToString();
collected.Add((url.Contains('{') && url.Contains('}')) ? new BookmarkPlaceholderPage(name, url, type) : new UrlAction(name, url, type));
}
}
}
}