Skip to content

Commit a1ecded

Browse files
Write logs to user dir and update user agent
Logs will now be written to the user directory if user profiles are enabled. Renamed user agent from 'Mozilla/5.0' to the following pattern: 'ApplicationShortName/CUEToolsVersion ( github uri )'. Changed the proxy settings warning color from yellow to orange.
1 parent e7583ff commit a1ecded

5 files changed

Lines changed: 12 additions & 13 deletions

File tree

CUERipper.Avalonia/App.axaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ public override void Initialize()
5656
.MinimumLevel.Debug()
5757
.MinimumLevel.Override("Microsoft", LogEventLevel.Warning)
5858
.Enrich.FromLogContext()
59-
.Enrich.WithProperty("Application", "CUERipper")
60-
.WriteTo.File("logs/log-.txt"
59+
.Enrich.WithProperty("Application", Constants.ApplicationName)
60+
.WriteTo.File(Path.Combine(Constants.ProfileDir, "logs/log-.txt")
6161
, rollingInterval: RollingInterval.Day
6262
, retainedFileCountLimit: 10
6363
).CreateLogger();

CUERipper.Avalonia/Configuration/CUEConfigFacade.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public static CUEConfigFacade Create()
115115

116116
if (!Design.IsDesignMode)
117117
{
118-
var settingsReader = new SettingsReader(Constants.ApplicationUserContentFolder, "settings.txt", Constants.ApplicationPath);
118+
var settingsReader = new SettingsReader(Constants.ApplicationShortName, "settings.txt", Constants.ApplicationPath);
119119
cueConfig.Load(settingsReader);
120120

121121
try
@@ -157,7 +157,7 @@ public static CUEConfigFacade Create()
157157
private readonly static XmlWriterSettings xmlEmptySettings = new() { Indent = true, OmitXmlDeclaration = true };
158158
public void Save()
159159
{
160-
var sw = new SettingsWriter(Constants.ApplicationUserContentFolder, "settings.txt", Constants.ApplicationPath);
160+
var sw = new SettingsWriter(Constants.ApplicationShortName, "settings.txt", Constants.ApplicationPath);
161161
_cueConfig.Save(sw);
162162

163163
sw.Save("OutputAudioType", (int)OutputCompression);

CUERipper.Avalonia/Constants.cs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,15 @@ public static class Constants
4444
$"%music%/%artist%/[%year% - ]%album%[ '('disc %discnumberandname%')'][' ('%releasedateandlabel%')'][' ('%unique%')']/%artist% - %album%{CueExtension}"
4545
];
4646
public const int MaxPathFormats = 10; // Based on the original CUERipper limit
47-
48-
public const string ApplicationName = $"CUERipper.Avalonia {CUESheet.CUEToolsVersion}";
47+
48+
public const string ApplicationShortName = "CUERipper";
49+
public const string ApplicationName = $"{ApplicationShortName}.Avalonia {CUESheet.CUEToolsVersion}";
4950

5051
public const string PathNoto = "avares://CUERipper.Avalonia/Assets/noto-emoji/32/";
5152

5253
public const int HiResImageMaxDimension = 2048;
5354

54-
public const string UserAgent = "Mozilla/5.0";
55+
public const string UserAgent = $"{ApplicationShortName}/{CUESheet.CUEToolsVersion} ( https://github.com/gchudov/cuetools.net )";
5556
public const string GithubApiUri = "https://api.github.com/repos/UnknownException/cuetools.net/releases";
5657
// "https://api.github.com/repos/gchudov/cuetools.net/releases"
5758
public const string GithubBranch = "cueripper-avalonia"; // "master"
@@ -60,14 +61,12 @@ public static class Constants
6061

6162
public const char NullDrive = '\0';
6263

63-
64-
public const string ApplicationUserContentFolder = "CUERipper";
6564
#if NET47
6665
public static readonly string ApplicationPath = AppDomain.CurrentDomain.BaseDirectory;
6766
#else
6867
public static readonly string ApplicationPath = Environment.ProcessPath ?? throw new NullReferenceException("Can't determine path.");
6968
#endif
70-
public static readonly string ProfileDir = SettingsShared.GetProfileDir(ApplicationUserContentFolder, ApplicationPath);
69+
public static readonly string ProfileDir = SettingsShared.GetProfileDir(ApplicationShortName, ApplicationPath);
7170

7271
public static readonly string PathImageCache = Path.Combine(ProfileDir, ".AlbumCache/");
7372
public static readonly string PathUpdateFolder = Path.Combine(ProfileDir, ".cueupdate/");

CUERipper.Avalonia/Views/OptionsDialog.axaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,9 +132,9 @@
132132
</DataGridTemplateColumn>
133133
</DataGrid.Columns>
134134
</DataGrid>
135-
<TextBlock Text="Warning: Changes will take effect after restarting&#10;the application."
135+
<TextBlock Text="Changes will take effect after restarting the&#10;application."
136136
Margin="5"
137-
Foreground="Yellow"
137+
Foreground="Orange"
138138
FontWeight="Bold"/>
139139
</StackPanel>
140140
</TabItem>

CUETools.Processor/CUESheet.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class CUESheet
2828
{
2929
#region Fields
3030

31-
public const string CUEToolsVersion = "2.2.6b";
31+
public const string CUEToolsVersion = "2.2.6c";
3232

3333
private bool _stop, _pause;
3434
private List<CUELine> _attributes;

0 commit comments

Comments
 (0)