github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-14 09:12:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed ##1492 and finished the episode searcher for #1464

Browse source
This commit is contained in:
Jamie.Rees 2017-08-24 08:43:50 +01:00
parent d7f0f61ece
commit 9ed6fd09a4
5 changed files with 38 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/Ombi.Settings/Settings/SettingsService.cs
View file

@ -46,7 +46,11 @@ namespace Ombi.Settings.Settings
return new T();
}
result.Content = DecryptSettings(result);
return string.IsNullOrEmpty(result.Content) ? null : JsonConvert.DeserializeObject<T>(result.Content, SerializerSettings.Settings);
var obj = string.IsNullOrEmpty(result.Content) ? null : JsonConvert.DeserializeObject<T>(result.Content, SerializerSettings.Settings);
var model = obj;
return model;
}
public bool SaveSettings(T model)
@ -67,10 +71,10 @@ namespace Ombi.Settings.Settings
var modified = model;
modified.Id = entity.Id;
entity.Content = JsonConvert.SerializeObject(modified, SerializerSettings.Settings);
var globalSettings = new GlobalSettings { SettingsName = EntityName, Content = JsonConvert.SerializeObject(modified, SerializerSettings.Settings), Id = entity.Id };
globalSettings.Content = EncryptSettings(globalSettings);
Repo.Update(globalSettings);
entity.Content = EncryptSettings(entity);
Repo.Update(entity);
return true;
}
@ -85,7 +89,7 @@ namespace Ombi.Settings.Settings
var settings = new GlobalSettings { SettingsName = EntityName, Content = JsonConvert.SerializeObject(newEntity, SerializerSettings.Settings) };
settings.Content = EncryptSettings(settings);
var insertResult = await Repo.InsertAsync(settings).ConfigureAwait(false);
var insertResult = await Repo.InsertAsync(settings);
return insertResult != null;
}
@ -93,9 +97,10 @@ namespace Ombi.Settings.Settings
var modified = model;
modified.Id = entity.Id;
var globalSettings = new GlobalSettings { SettingsName = EntityName, Content = JsonConvert.SerializeObject(modified, SerializerSettings.Settings), Id = entity.Id };
globalSettings.Content = EncryptSettings(globalSettings);
await Repo.UpdateAsync(globalSettings).ConfigureAwait(false);
entity.Content = JsonConvert.SerializeObject(modified, SerializerSettings.Settings);
entity.Content = EncryptSettings(entity);
await Repo.UpdateAsync(entity);
return true;
}