diff options
| author | TSRBerry <20988865+TSRBerry@users.noreply.github.com> | 2024-01-29 19:58:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-29 19:58:18 +0100 |
| commit | 70fcba39de34fc211d09da12783898161724b0dc (patch) | |
| tree | 9efdf7c191694e95de149129c9032b129527cb32 /src/Ryujinx.Ui.Common/Configuration/LoggerModule.cs | |
| parent | 7795b662a9b6054343195db9fc221a920509c1be (diff) | |
Make config filename changable for releases & Log to Ryujinx directory if application directory is not writable (#4707)1.1.1144
* Remove GetBaseApplicationDirectory() & Move logs directory to user base path
We should assume the application directory might be write-protected.
* Use Ryujinx.sh in Ryujinx.desktop
This desktop file isn't really used right now,
so this changes effectively nothing.
* Use properties in ReleaseInformation.cs and add ConfigName property
* Configure config filename in Github workflows
* Add a separate config step for macOS
Because they use BSD sed instead of GNU sed
* Keep log directory at the old location for dev environments
* Add FileSystemUtils since Directory.Move() doesn't work across filesystems
Steal CopyDirectory code from https://learn.microsoft.com/en-us/dotnet/standard/io/how-to-copy-directories
* Fix "Open Logs folder" button pointing to the wrong directory
* Add execute permissions to Ryujinx.sh
* Fix missing newlines
* AppDataManager: Use FileSystemUtils.MoveDirectory()
* Make dotnet format happy
* Add a fallback for the logging directory
Diffstat (limited to 'src/Ryujinx.Ui.Common/Configuration/LoggerModule.cs')
| -rw-r--r-- | src/Ryujinx.Ui.Common/Configuration/LoggerModule.cs | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/src/Ryujinx.Ui.Common/Configuration/LoggerModule.cs b/src/Ryujinx.Ui.Common/Configuration/LoggerModule.cs index 54ad20dd..6cd63272 100644 --- a/src/Ryujinx.Ui.Common/Configuration/LoggerModule.cs +++ b/src/Ryujinx.Ui.Common/Configuration/LoggerModule.cs @@ -1,7 +1,9 @@ using Ryujinx.Common; +using Ryujinx.Common.Configuration; using Ryujinx.Common.Logging; using Ryujinx.Common.Logging.Targets; using System; +using System.IO; namespace Ryujinx.Ui.Common.Configuration { @@ -80,8 +82,23 @@ namespace Ryujinx.Ui.Common.Configuration { if (e.NewValue) { + FileStream logFile = FileLogTarget.PrepareLogFile(AppDomain.CurrentDomain.BaseDirectory); + + if (logFile == null) + { + logFile = FileLogTarget.PrepareLogFile(AppDataManager.BaseDirPath); + + if (logFile == null) + { + Logger.Error?.Print(LogClass.Application, "No writable log directory available. Make sure either the application directory or the Ryujinx directory is writable."); + Logger.RemoveTarget("file"); + + return; + } + } + Logger.AddTarget(new AsyncLogTargetWrapper( - new FileLogTarget(ReleaseInformation.GetBaseApplicationDirectory(), "file"), + new FileLogTarget("file", logFile), 1000, AsyncLogTargetOverflowAction.Block )); |