Fix price calculation for info display

- Fix price calculation to use official_price when available, falling back to price

Author: daydreamer-json

build-rel.bat

@@ -1,7 +1,7 @@
 @echo off&cd /d %~dp0
 
 set "ISCC_PATH=C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
-set VERSION_NUM=1.2.2
+set VERSION_NUM=1.2.3
 
 mkdir build\asmr-dl-ng
 xcopy bin build\asmr-dl-ng\bin /E /I /Q

package.json

@@ -1,6 +1,6 @@
 {
   "name": "asmr-dl-ng",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "ASMR Direct Downloader (New Generation)",
   "author": "daydreamer-json <[email protected]> (https://github.com/daydreamer-json)",
   "license": "AGPL-3.0-or-later",

setup/main.iss

@@ -1,5 +1,5 @@
 #define MyAppName "asmr-dl-ng"
-#define MyAppVersion "1.2.2"
+#define MyAppVersion "1.2.3"
 #define MyAppPublisher "daydreamer-json"
 #define MyAppURL "https://github.com/daydreamer-json/asmr-dl-ng"
 #define MyAppExeName "asmr-dl-ng.exe"

src/utils/configEmbed.ts

@@ -2,5 +2,5 @@ import semver from 'semver';
 
 export default {
   APPLICATION_NAME: 'asmr-dl-ng',
-  VERSION_NUMBER: semver.valid('1.2.2'),
+  VERSION_NUMBER: semver.valid('1.2.3'),
 };

src/utils/termPretty.ts

@@ -160,15 +160,16 @@ function printWorkInfo(workApiRsp: {
 
   const tmpObj = {
     dlCount: workApiRsp.infoOrig.dl_count.toLocaleString(),
-    price: workApiRsp.infoOrig.price.toLocaleString(),
     ...(() => {
-      const outPrice: number = (workApiRsp.infoOrig.price * 100) / (100 + configReadOnly.jpyTax);
+      const rawApiPrice = workApiRsp.infoOrig.official_price ?? workApiRsp.infoOrig.price;
+      const outPrice: number = (rawApiPrice * 100) / (100 + configReadOnly.jpyTax);
       const inputPrice: number =
         outPrice > configReadOnly.dlsitePriceTable.at(-1)?.output!
           ? outPrice * 0.8
           : configReadOnly.dlsitePriceTable.find((e) => e.output === outPrice)!.input;
       const dlsiteFeePrice: number = outPrice - inputPrice;
       return {
+        price: rawApiPrice.toLocaleString(),
         creatorEarn: (inputPrice * workApiRsp.infoOrig.dl_count).toLocaleString(),
         bizEarn: (dlsiteFeePrice * workApiRsp.infoOrig.dl_count).toLocaleString(),
         feePcnt: mathUtils.rounder('round', (dlsiteFeePrice / inputPrice) * 100, 1).orig.toString() + '%',