Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 10:46:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

more fixes for getting styleCop up, this will need one more push to get another 15 that will require renaming of vars (#5875)

Browse Source
This commit is contained in:
Clint Rutkas
2020-08-11 13:40:26 -07:00
committed by GitHub
parent 90502f7553
commit 2c49df4be3
24 changed files with 255 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/launcher/Wox.Infrastructure/Storage/BinaryStorage`1.cs
View File

@@ -77,7 +77,7 @@ namespace Wox.Infrastructure.Storage
AppDomain.CurrentDomain.AssemblyResolve += CurrentDomain_AssemblyResolve;
BinaryFormatter binaryFormatter = new BinaryFormatter
{
AssemblyFormat = FormatterAssemblyStyle.Simple
AssemblyFormat = FormatterAssemblyStyle.Simple,
};
try
@@ -119,7 +119,7 @@ namespace Wox.Infrastructure.Storage
{
BinaryFormatter binaryFormatter = new BinaryFormatter
{
AssemblyFormat = FormatterAssemblyStyle.Simple
AssemblyFormat = FormatterAssemblyStyle.Simple,
};
try

4
src/modules/launcher/Wox.Infrastructure/Storage/FileSystemWatcherWrapper.cs
View File

@@ -10,7 +10,9 @@ namespace Wox.Infrastructure.Storage
// File System Watcher Wrapper class which implements the IFileSystemWatcherWrapper interface
public class FileSystemWatcherWrapper : FileSystemWatcher, IFileSystemWatcherWrapper
{
public FileSystemWatcherWrapper() { }
public FileSystemWatcherWrapper()
{
}
Collection<string> IFileSystemWatcherWrapper.Filters
{

2
src/modules/launcher/Wox.Infrastructure/Storage/JsonStorage`1.cs
View File

@@ -37,7 +37,7 @@ namespace Wox.Infrastructure.Storage
_serializerSettings = new JsonSerializerSettings
{
ObjectCreationHandling = ObjectCreationHandling.Replace,
NullValueHandling = NullValueHandling.Ignore
NullValueHandling = NullValueHandling.Ignore,
};
}

5
src/modules/launcher/Wox.Infrastructure/Storage/ListRepository`1.cs
View File

@@ -18,7 +18,10 @@ namespace Wox.Infrastructure.Storage
/// <typeparam name="T">typeof</typeparam>
public class ListRepository<T> : IRepository<T>, IEnumerable<T>
{
public IList<T> Items { get { return _items.Values.ToList(); } }
public IList<T> Items
{
get { return _items.Values.ToList(); }
}
private ConcurrentDictionary<int, T> _items = new ConcurrentDictionary<int, T>();

3
src/modules/launcher/Wox.Infrastructure/Storage/PluginJsonStorage`1.cs
View File

@@ -6,7 +6,8 @@ using System.IO;
namespace Wox.Infrastructure.Storage
{
public class PluginJsonStorage<T> : JsonStorage<T> where T : new()
public class PluginJsonStorage<T> : JsonStorage<T>
where T : new()
{
public PluginJsonStorage()
{

14
src/modules/launcher/Wox.Infrastructure/Storage/StoragePowerToysVersionInfo.cs
View File

@@ -12,16 +12,16 @@ namespace Wox.Infrastructure.Storage
// This detail is accessed by the storage items and is used to decide if the cache must be deleted or not
public bool clearCache = false;
private String currentPowerToysVersion = String.Empty;
private string currentPowerToysVersion = string.Empty;
private String FilePath { get; set; } = String.Empty;
private string FilePath { get; set; } = string.Empty;
// As of now this information is not pertinent but may be in the future
// There may be cases when we want to delete only the .cache files and not the .json storage files
private enum StorageType
{
BINARY_STORAGE = 0,
JSON_STORAGE = 1
JSON_STORAGE = 1,
}
// To compare the version numbers
@@ -33,7 +33,7 @@ namespace Wox.Infrastructure.Storage
// If there is some error in populating/retrieving the version numbers, then the cache must be deleted
// This case will not be hit, but is present as a fail safe
if (String.IsNullOrEmpty(version1) || String.IsNullOrEmpty(version2))
if (string.IsNullOrEmpty(version1) || string.IsNullOrEmpty(version2))
{
return true;
}
@@ -81,7 +81,7 @@ namespace Wox.Infrastructure.Storage
}
}
private string GetFilePath(String AssociatedFilePath, int type)
private string GetFilePath(string AssociatedFilePath, int type)
{
string suffix = string.Empty;
string cacheSuffix = ".cache";
@@ -100,12 +100,12 @@ namespace Wox.Infrastructure.Storage
return filePath;
}
public StoragePowerToysVersionInfo(String AssociatedFilePath, int type)
public StoragePowerToysVersionInfo(string AssociatedFilePath, int type)
{
FilePath = GetFilePath(AssociatedFilePath, type);
// Get the previous version of PowerToys and cache Storage details from the CacheDetails.json storage file
String previousVersion = GetPreviousVersion();
string previousVersion = GetPreviousVersion();
currentPowerToysVersion = Microsoft.PowerToys.Settings.UI.Lib.Utilities.Helper.GetProductVersion();
// If the previous version is below a set threshold, then we want to delete the file

3
src/modules/launcher/Wox.Infrastructure/Storage/WoxJsonStorage`1.cs
View File

@@ -6,7 +6,8 @@ using System.IO;
namespace Wox.Infrastructure.Storage
{
public class WoxJsonStorage<T> : JsonStorage<T> where T : new()
public class WoxJsonStorage<T> : JsonStorage<T>
where T : new()
{
public WoxJsonStorage()
{