tyler/Libation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Libation 4.0 prep: Add legacy settings-file support. Move AudibleApiStorage

Browse Source
This commit is contained in:
Robert McRackan 2020-08-13 14:37:16 -04:00
parent e1299331cc
commit e0406378cb
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
InternalUtilities/UNTESTED/AudibleApiActions.cs
View File

@ -12,6 +12,13 @@ namespace InternalUtilities
{ {
public static class AudibleApiActions public static class AudibleApiActions
{ {
public static async Task<Api> GetApiAsyncLegacy30(ILoginCallback loginCallback = null)
{
Localization.SetLocale(Configuration.Instance.LocaleCountryCode);
return await EzApiCreator.GetApiAsync(AudibleApiStorage.AccountsSettingsFileLegacy30, null, loginCallback);
}
/// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary> /// <summary>USE THIS from within Libation. It wraps the call with correct JSONPath</summary>
public static async Task<Api> GetApiAsync(ILoginCallback loginCallback = null) public static async Task<Api> GetApiAsync(ILoginCallback loginCallback = null)
{ {

11
FileManager/UNTESTED/AudibleApiStorage.cs → InternalUtilities/UNTESTED/AudibleApiStorage.cs
View File

@ -1,10 +1,17 @@
using Newtonsoft.Json; using System;
using System.IO; using System.IO;
using System.Linq;
using AudibleApi;
using FileManager;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace FileManager namespace InternalUtilities
{ {
public static class AudibleApiStorage public static class AudibleApiStorage
{ {
public static string AccountsSettingsFileLegacy30 => Path.Combine(Configuration.Instance.LibationFiles, "IdentityTokens.json");
public static string AccountsSettingsFile => Path.Combine(Configuration.Instance.LibationFiles, "AccountsSettings.json"); public static string AccountsSettingsFile => Path.Combine(Configuration.Instance.LibationFiles, "AccountsSettings.json");
public static string GetJsonPath( public static string GetJsonPath(

2
LibationLauncher/LibationLauncher.csproj
View File

@ -13,7 +13,7 @@
<!-- <PublishSingleFile>true</PublishSingleFile> --> <!-- <PublishSingleFile>true</PublishSingleFile> -->
<RuntimeIdentifier>win-x64</RuntimeIdentifier> <RuntimeIdentifier>win-x64</RuntimeIdentifier>
<Version>3.1.12.82</Version> <Version>3.1.12.86</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

1
LibationWinForms/UNTESTED/Dialogs/SettingsDialog.cs
View File

@ -3,6 +3,7 @@ using System.IO;
using System.Windows.Forms; using System.Windows.Forms;
using Dinah.Core; using Dinah.Core;
using FileManager; using FileManager;
using InternalUtilities;
namespace LibationWinForms.Dialogs namespace LibationWinForms.Dialogs
{ {