Merge pull request #68 from HanaDigital/version-2.0.0

Fixed empty chapters on NovelFull
HanaDigital · Mar 5, 2024 · 0b455ca · 0b455ca
2 parents a037a9d + 9e9a99a
commit 0b455ca
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -28,16 +28,18 @@
 
 ## ABOUT
 
+
 Download and update translated web/light novels from a list of sites.  
 List of supported sites:  
--	[NovelFull](https://novelfull.com/)
+-	  [NovelFull](https://novelfull.com/)
+
 -   [BoxNovel](https://boxnovel.com/)
 -   [ReadLightNovel](https://www.readlightnovel.org/)
 -   [~~NovelPlanet~~](https://novelplanet.com/) _offline_
 
 Author: [@dr-nyt](https://github.com/dr-nyt)  
 Contributors: [@webdagger](https://github.com/webdagger), [@jiskim](https://github.com/jiskim)  
-Version: 2.0.6  
+Version: 2.0.7  
 
 ## FEATURES
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "NovelScraper",
-	"version": "2.0.6",
+	"version": "2.0.7",
 	"description": "App for downloading novels from pirate sites.",
 	"homepage": "https://github.com/HanaDigital/NovelScraper",
 	"author": {
@@ -17,6 +17,23 @@
 	],
 	"main": "main.js",
 	"private": true,
+	"build": {
+		"productName": "NovelScraper",
+		"buildVersion": "2.0.7",
+		"files": ["**/*", "dist/**/*"],
+		"directories": {
+			"output": "release",
+			"buildResources": "dist"
+		},
+		"win": {
+			"icon": "dist/assets/icons/favicon.ico",
+			"publish": ["github"],
+			"target": ["nsis"]
+		},
+		"nsis": {
+			"runAfterFinish": true
+		}
+	},
 	"scripts": {
 		"postinstall": "electron-builder install-app-deps",
 		"ng": "ng",
@@ -104,4 +121,4 @@
 		"rimraf": "3.0.2",
 		"shelljs": "0.8.4"
 	}
-}
+}
diff --git a/src/app/services/sources/novelfull.service.ts b/src/app/services/sources/novelfull.service.ts
@@ -318,11 +318,16 @@ export class NovelfullService extends sourceService {
 						/\(adsbygoogle = window.adsbygoogle \|\| \[\]\).push\({}\);/g,
 						""
 					);
-					chapterBody = chapterBody.replace(/<script.*><\/script>/g, "");
-					chapterBody = chapterBody.replace(/<ins.*<\/ins>/g, "");
+					chapterBody = chapterBody.replace(/<script.*?<\/script>/g, "");
+					chapterBody = chapterBody.replace(/<ins.*?<\/ins>/g, "");
+					chapterBody = chapterBody.replace(/id=".*?"/g, "");
+					chapterBody = chapterBody.replace(/class=".*?"/g, "");
+					chapterBody = chapterBody.replace(/style=".*?"/g, "");
+					chapterBody = chapterBody.replace(/data-.*?=".*?"/g, "");
 
 					const chapter = this.prepChapter(novel, downloadID, chapterTitle, chapterBody, downloadedChapters.length, totalLength);
 					downloadedChapters.push(chapter);
+					return;
 				}
 
 				if (!canceled) this.novelFactory.generateEpub(novel, downloadedChapters, downloadID);

diff --git a/src/app/services/sources/sourceService.ts b/src/app/services/sources/sourceService.ts
@@ -77,8 +77,8 @@ export class sourceService {
 		currentPos: number,
 		destPos: number
 	): chapterObj {
-		chapterBody = chapterBody.replace(/<script.*<\/script>/gi, ""); // Remove any script tags usually used with ads (Security+)
-		chapterBody = chapterBody.replace(/<iframe.*<\/iframe>/gi, ""); // Remove any iframes usually used with ads
+		chapterBody = chapterBody.replace(/<script.*?<\/script>/gi, ""); // Remove any script tags usually used with ads (Security+)
+		chapterBody = chapterBody.replace(/<iframe.*?<\/iframe>/gi, ""); // Remove any iframes usually used with ads
 		chapterBody = chapterBody.replace(/< *br *>/gi, "<br/>"); // Make sure all <br/> tags end correctly for xhtml
 		chapterBody = chapterBody.replace(/<br *\/ *br *>/gi, ""); // Remove any useless </br> tags
 		chapterBody = chapterBody.replace(