-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
24 changed files
with
104 additions
and
92 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| [ | ||
| { | ||
| "Url": "https://github.com/audiamus/BookLibConnect/releases/download/v0.8/BookLibConnect-0.8-Setup.exe", | ||
| "Url": "https://github.com/audiamus/BookLibConnect/releases/download/v0.9/BookLibConnect-0.9-Setup.exe", | ||
| "AppName": "BookLibConnect", | ||
| "Version": "0.8", | ||
| "Version": "0.9", | ||
| "Preview": false, | ||
| "Descript": "Standalone Audible downloader and decrypter, companion to AAX Audio Converter", | ||
| "Md5": "00e23831b05d51cc62b76cdb433648b2" | ||
| "Md5": "741a9fa8bf4d66066a3c9e2e378846f0" | ||
| } | ||
| ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net5.0</TargetFramework> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <RootNamespace>core.audiamus.aux</RootNamespace> | ||
| <AssemblyName>audiamus.aux.core</AssemblyName> | ||
| <Authors>audiamus</Authors> | ||
| <AssemblyVersion>2.1.0.1</AssemblyVersion> | ||
| <FileVersion>2.1.0.1</FileVersion> | ||
| <AssemblyVersion>2.2.0.0</AssemblyVersion> | ||
| <FileVersion>2.2.0.0</FileVersion> | ||
| <Copyright>Copyright © 2019 - $([System.DateTime]::UtcNow.Year) audiamus ($([System.DateTime]::UtcNow.ToString("s")))</Copyright> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="System.Drawing.Common" Version="5.0.2" /> | ||
| <PackageReference Include="System.Drawing.Common" Version="6.0.0" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net5.0</TargetFramework> | ||
| <TargetFramework>net6.0</TargetFramework> | ||
| <RootNamespace>core.audiamus.common</RootNamespace> | ||
| <AssemblyName>audiamus.common.types.core</AssemblyName> | ||
| <Authors>audiamus</Authors> | ||
| <Copyright>Copyright © 2021 - $([System.DateTime]::UtcNow.Year) audiamus ($([System.DateTime]::UtcNow.ToString("s")))</Copyright> | ||
| <AssemblyVersion>0.1.0.0</AssemblyVersion> | ||
| <FileVersion>0.1.0.0</FileVersion> | ||
| <AssemblyVersion>0.2.0.0</AssemblyVersion> | ||
| <FileVersion>0.2.0.0</FileVersion> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
src/Connect.app.gui.core/Properties/PublishProfiles/FolderProfile.pubxml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,17 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| https://go.microsoft.com/fwlink/?LinkID=208121. | ||
| https://go.microsoft.com/fwlink/?LinkID=208121. | ||
| --> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <Project> | ||
| <PropertyGroup> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>Any CPU</Platform> | ||
| <PublishDir>bin\Release\net5.0-windows\publish\</PublishDir> | ||
| <PublishDir>bin\Release\net6.0-windows\publish\</PublishDir> | ||
| <PublishProtocol>FileSystem</PublishProtocol> | ||
| <TargetFramework>net5.0-windows</TargetFramework> | ||
| <TargetFramework>net6.0-windows</TargetFramework> | ||
| <RuntimeIdentifier>win-x64</RuntimeIdentifier> | ||
| <SelfContained>false</SelfContained> | ||
| <PublishSingleFile>True</PublishSingleFile> | ||
| <PublishReadyToRun>True</PublishReadyToRun> | ||
| <PublishSingleFile>true</PublishSingleFile> | ||
| <PublishReadyToRun>true</PublishReadyToRun> | ||
| </PropertyGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -124,17 +124,20 @@ const string GROUPS | |
| if (pageResult is null) | ||
| return null; | ||
|
|
||
| if (Logging.Level >= 3) { | ||
| string file = pageResult.WriteTempJsonFile ("LibraryResponse"); | ||
| Log (3, this, () => $"page={page}, file=\"{Path.GetFileName (file)}\""); | ||
| } | ||
|
|
||
| adb.json.LibraryResponse libraryResponse = adb.json.LibraryResponse.Deserialize (pageResult); | ||
| if (libraryResponse is null) | ||
| return null; | ||
|
|
||
| if (!(libraryResponse?.items.Any () ?? false)) | ||
| break; | ||
|
|
||
| var pageProducts = libraryResponse.items; | ||
| Log (3, this, () => $"#items/page={pageProducts.Length}"); | ||
| if (Logging.Level >= 3) { | ||
| string file = pageResult.WriteTempJsonFile ("LibraryResponse"); | ||
| Log (3, this, () => $"page={page}, file=\"{Path.GetFileName (file)}\""); | ||
| } | ||
| libProducts.AddRange (pageProducts); | ||
| } | ||
| } else { | ||
|
|
@@ -206,7 +209,7 @@ public async Task<bool> GetActivationBytesAsync () { | |
|
|
||
| adb.json.LicenseResponse license = adb.json.LicenseResponse.Deserialize (response); | ||
|
|
||
| decryptLicense (license.content_license); | ||
| decryptLicense (license?.content_license); | ||
|
|
||
| return license; | ||
| } | ||
|
|
@@ -224,7 +227,7 @@ public async Task<bool> GetDownloadLicenseAndSaveAsync (Conversion conversion, E | |
| return false; | ||
| } | ||
|
|
||
| var lic = licresp.content_license; | ||
| var lic = licresp?.content_license; | ||
| if (lic?.voucher is null) { | ||
| conversion.State = EConversionState.license_denied; | ||
| Log (3, this, () => $"{conversion}; license decryption failed."); | ||
|
|
@@ -368,9 +371,9 @@ void rename (string file, string suffix) { | |
| File.Move (file, sfxfile, true); | ||
| } | ||
|
|
||
| void aaxFile_ConversionProgressUpdate (object sender, ConversionProgressEventArgs e) { | ||
| async void aaxFile_ConversionProgressUpdate (object sender, ConversionProgressEventArgs e) { | ||
| if (cancToken.IsCancellationRequested) | ||
| aaxFile?.Cancel (); | ||
| await aaxFile?.CancelAsync (); | ||
| progressAction.Invoke (conversion, e.ProcessPosition); | ||
| } | ||
| } | ||
|
|
@@ -479,6 +482,9 @@ private void decryptLicense (adb.json.ContentLicense license) { | |
| // See also | ||
| //https://patchwork.ffmpeg.org/project/ffmpeg/patch/[email protected]/ | ||
|
|
||
| if (license is null) | ||
| return; | ||
|
|
||
| string hashable = Profile.DeviceInfo.Type + Profile.DeviceInfo.Serial + Profile.CustomerInfo.AccountId + | ||
| license.asin; | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.