glax/Tranga-Website
1
0
Fork 0
Code Issues Pull Requests Releases Activity

JsonIgnore

Browse Source 
And better working directory stuff
This commit is contained in:
glax 2023-05-22 02:06:49 +02:00
parent 962fe9529e
commit 972cba69ec
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Tranga/TrangaSettings.cs
View File

@ -6,15 +6,14 @@ public class TrangaSettings
{ {
public string downloadLocation { get; set; } public string downloadLocation { get; set; }
public string workingDirectory { get; set; } public string workingDirectory { get; set; }
public string settingsFilePath => Path.Join(workingDirectory, "settings.json"); [JsonIgnore]public string settingsFilePath => Path.Join(workingDirectory, "settings.json");
public string tasksFilePath => Path.Join(workingDirectory, "tasks.json"); [JsonIgnore]public string tasksFilePath => Path.Join(workingDirectory, "tasks.json");
public string knownPublicationsPath => Path.Join(workingDirectory, "knownPublications.json"); [JsonIgnore]public string knownPublicationsPath => Path.Join(workingDirectory, "knownPublications.json");
public Komga? komga { get; set; } public Komga? komga { get; set; }
public TrangaSettings(string downloadLocation, string? workingDirectory, Komga? komga) public TrangaSettings(string downloadLocation, string workingDirectory, Komga? komga)
{ {
this.workingDirectory = workingDirectory ?? this.workingDirectory = workingDirectory;
Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Tranga");
this.downloadLocation = downloadLocation; this.downloadLocation = downloadLocation;
this.komga = komga; this.komga = komga;
} }
@ -22,7 +21,7 @@ public class TrangaSettings
public static TrangaSettings LoadSettings(string importFilePath) public static TrangaSettings LoadSettings(string importFilePath)
{ {
if (!File.Exists(importFilePath)) if (!File.Exists(importFilePath))
return new TrangaSettings(Directory.GetCurrentDirectory(), null, null); return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"), Directory.GetCurrentDirectory(), null);
string toRead = File.ReadAllText(importFilePath); string toRead = File.ReadAllText(importFilePath);
TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead)!; TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead)!;