Skip to content

Commit 3c4c188

Browse files
committed
fix path setting not being under paths
relates to #19
1 parent 619ce8a commit 3c4c188

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/Accounts/User.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public bool DeletePreset(string name)
120120
public Settings.User Settings = new();
121121

122122
/// <summary>Path to the output directory appropriate to this session.</summary>
123-
public string OutputDirectory => Program.ServerSettings.AppendUserNameToOutputPath ? $"{Program.ServerSettings.Paths.OutputPath}/{UserID}" : Program.ServerSettings.Paths.OutputPath;
123+
public string OutputDirectory => Program.ServerSettings.Paths.AppendUserNameToOutputPath ? $"{Program.ServerSettings.Paths.OutputPath}/{UserID}" : Program.ServerSettings.Paths.OutputPath;
124124

125125
public LockObject UserLock = new();
126126

src/Core/Settings.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,6 @@ public class Settings : AutoConfiguration
3030
[ConfigComment("How to launch the UI. If 'none', just quietly launch. If 'web', launch your web-browser to the page. If 'webinstall', launch web-browser to the install page. If 'electron', launch the UI in an electron window.")]
3131
public string LaunchMode = "webinstall";
3232

33-
[ConfigComment("When true, output paths always have the username as a folder. When false, this will be skipped. Keep this on in multi-user environments.")]
34-
public bool AppendUserNameToOutputPath = true;
35-
3633
/// <summary>Settings related to backends.</summary>
3734
public class BackendData : AutoConfiguration
3835
{
@@ -77,6 +74,9 @@ public class PathsData : AutoConfiguration
7774

7875
[ConfigComment("Root path for output files (images, etc). Defaults to 'Output'")]
7976
public string OutputPath = "Output";
77+
78+
[ConfigComment("When true, output paths always have the username as a folder. When false, this will be skipped. Keep this on in multi-user environments.")]
79+
public bool AppendUserNameToOutputPath = true;
8080
}
8181

8282
/// <summary>Settings to control restrictions on users.</summary>

src/Core/WebServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public void Launch()
188188
public (string, string, string) CheckOutputFilePath(string path, string userId)
189189
{
190190
string root = Utilities.CombinePathWithAbsolute(Environment.CurrentDirectory, Program.ServerSettings.Paths.OutputPath);
191-
if (Program.ServerSettings.AppendUserNameToOutputPath)
191+
if (Program.ServerSettings.Paths.AppendUserNameToOutputPath)
192192
{
193193
root = $"{root}/{userId}";
194194
}

0 commit comments

Comments
 (0)