0.9.9.24 (just fixing things, that's all)

ImAiiR · Mar 16, 2023 · b7c8e24 · b7c8e24 · avladem · May 10, 2024
1 parent 048c577
commit b7c8e24
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/QobuzDownloaderX/LoginForm-v2.cs b/QobuzDownloaderX/LoginForm-v2.cs
@@ -389,16 +389,16 @@ private void getSecretBG_DoWork(object sender, DoWorkEventArgs e)
                 string text = getBundleRequest;
 
                 // Grab app_id from bundle.js
-                var bundleLog0 = Regex.Match(getBundleRequest, "\\):\\(n.qobuzapi={app_id:\"(?<appID>.*?)\",app_secret:").Groups;
+                var bundleLog0 = Regex.Match(getBundleRequest, "production:{api\\:{appId:\"(?<appID>.*?)\",appSecret:").Groups;
                 appID = bundleLog0[1].Value;
 
                 // Grab "info" and "extras"
-                var bundleLog1 = Regex.Match(getBundleRequest, "{offset:\"(?<notUsed>.*?)\",name:\"Europe\\/Berlin\",info:\"(?<info>.*?)\",extras:\"(?<extras>.*?)\"}").Groups;
-                var bundleInfo = bundleLog1[2].Value;
-                var bundleExtras = bundleLog1[3].Value;
+                var bundleLog1 = Regex.Match(getBundleRequest, "name:\"[A-Za-z\\/]+\\/Berlin\",info:\"(?<info>[\\w=]+)\",extras:\"(?<extras>[\\w=]+)\"").Groups;
+                var bundleInfo = bundleLog1[1].Value;
+                var bundleExtras = bundleLog1[2].Value;
 
                 // Grab "seed"
-                var bundleLog2 = Regex.Match(getBundleRequest, "window.utimezone.algier\\):f.initialSeed\\(\"(?<seed>.*?)\",window.utimezone.berlin\\)").Groups;
+                var bundleLog2 = Regex.Match(getBundleRequest, "[a-z]\\.initialSeed\\(\"(?<seed>[\\w=]+)\",window\\.utimezone\\.berlin\\)").Groups;
                 var bundleSeed = bundleLog2[1].Value;
 
                 // Step 1 of getting the app_secret

diff --git a/QobuzDownloaderX/Properties/AssemblyInfo.cs b/QobuzDownloaderX/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.9.9.23")]
-[assembly: AssemblyFileVersion("0.9.9.23")]
+[assembly: AssemblyVersion("0.9.9.24")]
+[assembly: AssemblyFileVersion("0.9.9.24")]
diff --git a/QobuzDownloaderX/QobuzDownloaderX.csproj b/QobuzDownloaderX/QobuzDownloaderX.csproj
@@ -52,8 +52,8 @@
     <ApplicationIcon>Resources\qbdlx_icon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="policy.2.0.taglib-sharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0, processorArchitecture=MSIL">

diff --git a/QobuzDownloaderX/packages.config b/QobuzDownloaderX/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net46" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net46" />
   <package id="taglib" version="2.1.0.0" targetFramework="net46" />
 </packages>