DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Core - replaced hardcoded backslashes with Path.Combine

Browse Source
This commit is contained in:
Diogo Trindade 2021-07-01 15:50:19 +01:00
parent d10ffcf62a
commit 0adcfa65c0
6 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Artemis.Core/Constants.cs
View File

@ -27,7 +27,7 @@ namespace Artemis.Core
/// <summary> /// <summary>
/// The full path to the Artemis data folder /// The full path to the Artemis data folder
/// </summary> /// </summary>
public static readonly string DataFolder = Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData) + "\\Artemis\\"; public static readonly string DataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Artemis");
/// <summary> /// <summary>
/// The plugin info used by core components of Artemis /// The plugin info used by core components of Artemis

28
src/Artemis.Core/Models/Surface/Layout/ArtemisLayout.cs
View File

@ -169,29 +169,29 @@ namespace Artemis.Core
internal static ArtemisLayout? GetDefaultLayout(ArtemisDevice device) internal static ArtemisLayout? GetDefaultLayout(ArtemisDevice device)
{ {
string layoutFolder = Path.Combine(Constants.ApplicationFolder, "DefaultLayouts\\Artemis"); string layoutFolder = Path.Combine(Constants.ApplicationFolder, "DefaultLayouts", "Artemis");
if (device.DeviceType == RGBDeviceType.Keyboard) if (device.DeviceType == RGBDeviceType.Keyboard)
{ {
// XL layout is defined by its programmable macro keys // XL layout is defined by its programmable macro keys
if (device.Leds.Any(l => l.RgbLed.Id >= LedId.Keyboard_Programmable1 && l.RgbLed.Id <= LedId.Keyboard_Programmable32)) if (device.Leds.Any(l => l.RgbLed.Id >= LedId.Keyboard_Programmable1 && l.RgbLed.Id <= LedId.Keyboard_Programmable32))
{ {
if (device.PhysicalLayout == KeyboardLayoutType.ANSI) if (device.PhysicalLayout == KeyboardLayoutType.ANSI)
return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis XL keyboard-ANSI.xml", LayoutSource.Default); return new ArtemisLayout(Path.Combine(layoutFolder, "Keyboard", "Artemis XL keyboard-ANSI.xml"), LayoutSource.Default);
return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis XL keyboard-ISO.xml", LayoutSource.Default); return new ArtemisLayout(Path.Combine(layoutFolder, "Keyboard", "Artemis XL keyboard-ISO.xml"), LayoutSource.Default);
} }
// L layout is defined by its numpad // L layout is defined by its numpad
if (device.Leds.Any(l => l.RgbLed.Id >= LedId.Keyboard_NumLock && l.RgbLed.Id <= LedId.Keyboard_NumPeriodAndDelete)) if (device.Leds.Any(l => l.RgbLed.Id >= LedId.Keyboard_NumLock && l.RgbLed.Id <= LedId.Keyboard_NumPeriodAndDelete))
{ {
if (device.PhysicalLayout == KeyboardLayoutType.ANSI) if (device.PhysicalLayout == KeyboardLayoutType.ANSI)
return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis L keyboard-ANSI.xml", LayoutSource.Default); return new ArtemisLayout(Path.Combine(layoutFolder + "Keyboard","Artemis L keyboard-ANSI.xml"), LayoutSource.Default);
return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis L keyboard-ISO.xml", LayoutSource.Default); return new ArtemisLayout(Path.Combine(layoutFolder + "Keyboard","Artemis L keyboard-ISO.xml"), LayoutSource.Default);
} }
// No numpad will result in TKL // No numpad will result in TKL
if (device.PhysicalLayout == KeyboardLayoutType.ANSI) if (device.PhysicalLayout == KeyboardLayoutType.ANSI)
return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis TKL keyboard-ANSI.xml", LayoutSource.Default); return new ArtemisLayout(Path.Combine(layoutFolder + "Keyboard","Artemis TKL keyboard-ANSI.xml"), LayoutSource.Default);
return new ArtemisLayout(layoutFolder + "\\Keyboard\\Artemis TKL keyboard-ISO.xml", LayoutSource.Default); return new ArtemisLayout(Path.Combine(layoutFolder + "Keyboard","Artemis TKL keyboard-ISO.xml"), LayoutSource.Default);
} }
// if (device.DeviceType == RGBDeviceType.Mouse) // if (device.DeviceType == RGBDeviceType.Mouse)
@ -199,21 +199,21 @@ namespace Artemis.Core
// if (device.Leds.Count == 1) // if (device.Leds.Count == 1)
// { // {
// if (device.Leds.Any(l => l.RgbLed.Id == LedId.Logo)) // if (device.Leds.Any(l => l.RgbLed.Id == LedId.Logo))
// return new ArtemisLayout(layoutFolder + "\\Mouse\\1 LED mouse logo.xml", LayoutSource.Default); // return new ArtemisLayout(Path.Combine(layoutFolder + "Mouse", "1 LED mouse logo.xml"), LayoutSource.Default);
// return new ArtemisLayout(layoutFolder + "\\Mouse\\1 LED mouse.xml", LayoutSource.Default); // return new ArtemisLayout(Path.Combine(layoutFolder + "Mouse", "1 LED mouse.xml"), LayoutSource.Default);
// } // }
// if (device.Leds.Any(l => l.RgbLed.Id == LedId.Logo)) // if (device.Leds.Any(l => l.RgbLed.Id == LedId.Logo))
// return new ArtemisLayout(layoutFolder + "\\Mouse\\4 LED mouse logo.xml", LayoutSource.Default); // return new ArtemisLayout(Path.Combine(layoutFolder + "Mouse", "4 LED mouse logo.xml"), LayoutSource.Default);
// return new ArtemisLayout(layoutFolder + "\\Mouse\\4 LED mouse.xml", LayoutSource.Default); // return new ArtemisLayout(Path.Combine(layoutFolder + "Mouse", "4 LED mouse.xml"), LayoutSource.Default);
// } // }
if (device.DeviceType == RGBDeviceType.Headset) if (device.DeviceType == RGBDeviceType.Headset)
{ {
if (device.Leds.Count == 1) if (device.Leds.Count == 1)
return new ArtemisLayout(layoutFolder + "\\Headset\\Artemis 1 LED headset.xml", LayoutSource.Default); return new ArtemisLayout(Path.Combine(layoutFolder + "Headset", "Artemis 1 LED headset.xml"), LayoutSource.Default);
if (device.Leds.Count == 2) if (device.Leds.Count == 2)
return new ArtemisLayout(layoutFolder + "\\Headset\\Artemis 2 LED headset.xml", LayoutSource.Default); return new ArtemisLayout(Path.Combine(layoutFolder + "Headset", "Artemis 2 LED headset.xml"), LayoutSource.Default);
return new ArtemisLayout(layoutFolder + "\\Headset\\Artemis 4 LED headset.xml", LayoutSource.Default); return new ArtemisLayout(Path.Combine(layoutFolder + "Headset", "Artemis 4 LED headset.xml"), LayoutSource.Default);
} }
return null; return null;

3
src/Artemis.Core/Models/Surface/Layout/ArtemisLedLayout.cs
View File

@ -61,7 +61,6 @@ namespace Artemis.Core
if (LayoutCustomLedData.LogicalLayouts == null || !LayoutCustomLedData.LogicalLayouts.Any()) if (LayoutCustomLedData.LogicalLayouts == null || !LayoutCustomLedData.LogicalLayouts.Any())
return; return;
Uri layoutDirectory = new(Path.GetDirectoryName(DeviceLayout.FilePath)! + "\\", UriKind.Absolute);
// Prefer a matching layout or else a default layout (that has no name) // Prefer a matching layout or else a default layout (that has no name)
LayoutCustomLedDataLogicalLayout logicalLayout = LayoutCustomLedData.LogicalLayouts LayoutCustomLedDataLogicalLayout logicalLayout = LayoutCustomLedData.LogicalLayouts
.OrderBy(l => l.Name == artemisDevice.LogicalLayout) .OrderBy(l => l.Name == artemisDevice.LogicalLayout)
@ -69,7 +68,7 @@ namespace Artemis.Core
.First(); .First();
LogicalName = logicalLayout.Name; LogicalName = logicalLayout.Name;
Image = new Uri(layoutDirectory, logicalLayout.Image); Image = new Uri(Path.Combine(Path.GetDirectoryName(DeviceLayout.FilePath)!, logicalLayout.Image!), UriKind.Absolute);
} }
} }
} }

3
src/Artemis.Core/Ninject/LoggerProvider.cs
View File

@ -1,4 +1,5 @@
using System; using System;
using System.IO;
using Ninject.Activation; using Ninject.Activation;
using Serilog; using Serilog;
using Serilog.Core; using Serilog.Core;
@ -12,7 +13,7 @@ namespace Artemis.Core.Ninject
private static readonly ILogger Logger = new LoggerConfiguration() private static readonly ILogger Logger = new LoggerConfiguration()
.Enrich.FromLogContext() .Enrich.FromLogContext()
.WriteTo.File(Constants.DataFolder + "logs/Artemis log-.log", .WriteTo.File(Path.Combine(Constants.DataFolder, "logs", "Artemis log-.log"),
rollingInterval: RollingInterval.Day, rollingInterval: RollingInterval.Day,
outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} [{Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}") outputTemplate: "{Timestamp:yyyy-MM-dd HH:mm:ss.fff} [{Level:u3}] [{SourceContext}] {Message:lj}{NewLine}{Exception}")
.WriteTo.Console() .WriteTo.Console()

4
src/Artemis.Core/Utilities/Utilities.cs
View File

@ -18,8 +18,8 @@ namespace Artemis.Core
public static void PrepareFirstLaunch() public static void PrepareFirstLaunch()
{ {
CreateAccessibleDirectory(Constants.DataFolder); CreateAccessibleDirectory(Constants.DataFolder);
CreateAccessibleDirectory(Constants.DataFolder + "plugins"); CreateAccessibleDirectory(Path.Combine(Constants.DataFolder ,"plugins"));
CreateAccessibleDirectory(Constants.DataFolder + "user layouts"); CreateAccessibleDirectory(Path.Combine(Constants.DataFolder ,"user layouts"));
} }
/// <summary> /// <summary>

8
src/Artemis.Storage/StorageManager.cs
View File

@ -19,11 +19,11 @@ namespace Artemis.Storage
if (_inUse) if (_inUse)
throw new Exception("Storage is already in use, can't backup now."); throw new Exception("Storage is already in use, can't backup now.");
string database = $"{dataFolder}\\database.db"; string database = Path.Combine(dataFolder, "database.db");
if (!File.Exists(database)) if (!File.Exists(database))
return; return;
string backupFolder = $"{dataFolder}\\database backups"; string backupFolder = Path.Combine(dataFolder, "database backups");
Directory.CreateDirectory(backupFolder); Directory.CreateDirectory(backupFolder);
FileSystemInfo[] files = new DirectoryInfo(backupFolder).GetFileSystemInfos(); FileSystemInfo[] files = new DirectoryInfo(backupFolder).GetFileSystemInfos();
if (files.Length >= 5) if (files.Length >= 5)
@ -36,7 +36,7 @@ namespace Artemis.Storage
oldest.Delete(); oldest.Delete();
} }
File.Copy(database, $"{backupFolder}\\database-{DateTime.Now:yyyy-dd-M--HH-mm-ss}.db"); File.Copy(database, Path.Combine(backupFolder, $"database-{DateTime.Now:yyyy-dd-M--HH-mm-ss}.db"));
} }
/// <summary> /// <summary>
@ -51,7 +51,7 @@ namespace Artemis.Storage
try try
{ {
_inUse = true; _inUse = true;
return new LiteRepository($"FileName={dataFolder}\\database.db"); return new LiteRepository($"FileName={Path.Combine(dataFolder, "database.db")}");
} }
catch (LiteException e) catch (LiteException e)
{ {