Fix the issue where files could become corrupted during retries after DL failures

- Add `jpyTax` and `dlsitePriceTable` to `configReadOnly.ts` for pricing calculations
- Enhance default exclude regex pattern in `configUser.ts` to cover more non-SE variations

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.1
+set VERSION_NUM=1.2.2
 
 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.1",
+  "version": "1.2.2",
   "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.1"
+#define MyAppVersion "1.2.2"
 #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.1'),
+  VERSION_NUMBER: semver.valid('1.2.2'),
 };

src/utils/configReadOnly.ts

@@ -7,4 +7,49 @@ export default {
       'If the program terminates abnormally, delete the folder containing this text file.\n',
     ].join('\n'),
   },
+  jpyTax: 10, // %
+  dlsitePriceTable: [
+    // input:  creator's desired wholesale price (creator's net earnings)
+    // output: actual selling price (including fees)
+    { input: 50, output: 100 },
+    { input: 100, output: 200 },
+    { input: 150, output: 300 },
+    { input: 200, output: 400 },
+    { input: 250, output: 500 },
+    { input: 300, output: 600 },
+    { input: 400, output: 700 },
+    { input: 450, output: 800 },
+    { input: 500, output: 900 },
+    { input: 600, output: 1000 },
+    { input: 700, output: 1100 },
+    { input: 800, output: 1200 },
+    { input: 900, output: 1300 },
+    { input: 950, output: 1400 },
+    { input: 1000, output: 1500 },
+    { input: 1100, output: 1600 },
+    { input: 1200, output: 1700 },
+    { input: 1300, output: 1800 },
+    { input: 1400, output: 1900 },
+    { input: 1450, output: 2000 },
+    { input: 1500, output: 2100 },
+    { input: 1600, output: 2200 },
+    { input: 1700, output: 2300 },
+    { input: 1800, output: 2400 },
+    { input: 1900, output: 2500 },
+    { input: 1950, output: 2600 },
+    { input: 2000, output: 2700 },
+    { input: 2100, output: 2800 },
+    { input: 2200, output: 2900 },
+    { input: 2300, output: 3000 },
+    { input: 2400, output: 3100 },
+    { input: 2450, output: 3200 },
+    { input: 2500, output: 3300 },
+    { input: 2600, output: 3400 },
+    { input: 2700, output: 3500 },
+    { input: 2800, output: 3600 },
+    { input: 2900, output: 3700 },
+    { input: 3000, output: 3800 },
+    { input: 3100, output: 3900 },
+    { input: 3200, output: 4000 },
+  ] as const,
 };

src/utils/configUser.ts

@@ -54,7 +54,7 @@ const initialConfig: ConfigType = {
     useAutoFilterRegex: false,
     filterRegex: {
       include: ['^.*$'],
-      exclude: ['^.*\\.mp3$', '^.*(SE|ＳＥ|効果音)(な|無)し.*$'],
+      exclude: ['^.*\\.mp3$', '^.*((SE|ＳＥ|se|ｓｅ|効果音)(な|無)し|noSE).*$'],
     },
   },
   media: {

src/utils/download.ts

@@ -286,6 +286,12 @@ async function downloadWork(
       };
 
       while (retriedCount <= appConfig.network.retryCount) {
+        // Ensure the file is deleted before attempting to download
+        try {
+          await fs.promises.unlink(outFilePath);
+        } catch (e: any) {
+          // if (e.code !== 'ENOENT') logger.warn(`Could not delete incomplete file: ${outFilePath}`);
+        }
         const abortController = new AbortController();
         let timeoutTimer: NodeJS.Timeout | null = null;
         let lastNonZeroRateTime = Date.now();
@@ -320,7 +326,7 @@ async function downloadWork(
           await stream.promises.pipeline(
             stream.Readable.fromWeb(response.body as any),
             progressStream,
-            fs.createWriteStream(outFilePath, { flags: 'wx' }),
+            fs.createWriteStream(outFilePath),
             { signal: abortController.signal },
           );
           progBarUpdateFunc(fileEntry.size);
@@ -332,9 +338,12 @@ async function downloadWork(
           if (timeoutTimer) clearInterval(timeoutTimer);
           timeoutTimer = null;
 
+          // Attempt to clean up the partially downloaded file
           try {
             await fs.promises.unlink(outFilePath);
-          } catch (_e) {}
+          } catch (e: any) {
+            // if (e.code !== 'ENOENT') logger.warn(`Could not delete incomplete file on error: ${outFilePath}`);
+          }
 
           retriedCount++;
           if (retriedCount > appConfig.network.retryCount) {

src/utils/termPretty.ts

@@ -8,6 +8,7 @@ import * as wakachigaki from 'wakachigaki';
 import * as TypesApiEndpoint from '../types/ApiEndpoint.js';
 import * as TypesApiFiles from '../types/ApiFiles.js';
 import appConfig from './config.js';
+import configReadOnly from './configReadOnly.js';
 import mathUtils from './math.js';
 import stringUtils from './string.js';
 
@@ -158,15 +159,43 @@ function printWorkInfo(workApiRsp: {
   const availableMaxTextWidth = Math.min(54, process.stdout.columns - 20);
 
   const tmpObj = {
-    dlCount: workApiRsp.info.dl_count.toLocaleString(),
-    price: workApiRsp.info.price.toLocaleString(),
-    totalSales: (workApiRsp.info.price * workApiRsp.info.dl_count).toLocaleString(),
+    dlCount: workApiRsp.infoOrig.dl_count.toLocaleString(),
+    price: workApiRsp.infoOrig.price.toLocaleString(),
+    ...(() => {
+      const outPrice: number = (workApiRsp.infoOrig.price * 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 {
+        creatorEarn: (inputPrice * workApiRsp.infoOrig.dl_count).toLocaleString(),
+        bizEarn: (dlsiteFeePrice * workApiRsp.infoOrig.dl_count).toLocaleString(),
+        feePcnt: mathUtils.rounder('round', (dlsiteFeePrice / inputPrice) * 100, 1).orig.toString() + '%',
+      };
+    })(),
     totalSize: mathUtils.formatFileSize(
       mathUtils.arrayTotal(workApiRsp.fileEntry.transformed.map((e) => e.size)),
       fmtFileSizeDefaultCfg,
     ),
   };
 
+  // (() => {
+  //   const table2 = new CliTable3(cliTableConfig.rounded);
+  //   table2.push(
+  //     ['Input', 'Output', 'Fee', 'Fee%'].map((e) => chalk.dim(e)),
+  //     ...configReadOnly.dlsitePriceTable.map((e) =>
+  //       [
+  //         e.input.toLocaleString(),
+  //         e.output.toLocaleString(),
+  //         (e.output - e.input).toLocaleString(),
+  //         mathUtils.rounder('round', ((e.output - e.input) / e.input) * 100, 1).padded + '%',
+  //       ].map((f) => ({ hAlign: 'right' as const, content: f })),
+  //     ),
+  //   );
+  //   console.log(table2.toString());
+  // })();
+
   table.push(
     ...[
       ['ID', workApiRsp.info.source_id],
@@ -200,8 +229,6 @@ function printWorkInfo(workApiRsp: {
           availableMaxTextWidth,
         ).join('\n'),
       ],
-      ['Release Date', DateTime.fromISO(workApiRsp.info.release).toFormat('yyyy/MM/dd')],
-      ['Created Date', DateTime.fromISO(workApiRsp.info.create_date).toFormat('yyyy/MM/dd')],
       [
         'Age Category',
         stringUtils.replaceMultiPatterns(
@@ -213,11 +240,20 @@ function printWorkInfo(workApiRsp: {
           workApiRsp.info.age_category_string,
         ),
       ],
+      ['Release Date', DateTime.fromISO(workApiRsp.info.release).toFormat('yyyy/MM/dd')],
+      ['Created Date', DateTime.fromISO(workApiRsp.info.create_date).toFormat('yyyy/MM/dd')],
       ['DL Count', tmpObj.dlCount.padStart(mathUtils.arrayMax(Object.values(tmpObj).map((e) => e.length)), ' ')],
       ['Price', tmpObj.price.padStart(mathUtils.arrayMax(Object.values(tmpObj).map((e) => e.length)), ' ') + ' JPY'],
       [
-        'Total Sales',
-        tmpObj.totalSales.padStart(mathUtils.arrayMax(Object.values(tmpObj).map((e) => e.length)), ' ') + ' JPY',
+        'Creator Earn',
+        tmpObj.creatorEarn.padStart(mathUtils.arrayMax(Object.values(tmpObj).map((e) => e.length)), ' ') + ' JPY',
+      ],
+      [
+        'DLsite Earn',
+        tmpObj.bizEarn.padStart(mathUtils.arrayMax(Object.values(tmpObj).map((e) => e.length)), ' ') +
+          ' JPY (' +
+          tmpObj.feePcnt +
+          ' fee)',
       ],
       [
         'Total Size',
@@ -276,10 +312,11 @@ function generateProgBarBox(current: number, total: number, width: number, useSh
   const remainingChars = width - usedChars;
 
   // generate empty area (LIGHT SHADE or space)
-  const emptyChar = useShade ? '\u2591' : ' ';
+  // const emptyChar = useShade ? '\u2591' : ' ';
+  const emptyChar = ' ';
   bar += emptyChar.repeat(remainingChars);
 
-  return bar;
+  return useShade ? chalk.bgHex('#404040')(bar) : bar;
 }
 
 function detectUseFancyProgBarBox(): Record<'fancy' | 'shade', boolean> {