diff --git a/package.json b/package.json index 3f1271f6..a6d7237a 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ "*.d.ts" ], "scripts": { + "clean": "rimraf packages/*/node_modules --glob", "run:core": "npm -C packages/core run start", "core:build": "npm -C packages/core run build", "shared:build": "npm -C packages/shared run build", diff --git a/packages/core/src/analyzer/AnalyzerHtml.ts b/packages/core/src/analyzer/AnalyzerHtml.ts index d8c592ae..2f4382d9 100644 --- a/packages/core/src/analyzer/AnalyzerHtml.ts +++ b/packages/core/src/analyzer/AnalyzerHtml.ts @@ -1,6 +1,15 @@ import { load } from 'cheerio' import type { Analyzer } from './Analyzer' +/** + * 去除 html 标签 + * @param {string} html + * @returns {string} + */ +function getHtmlString(html: string) { + return html.replaceAll(/<\/?(?:div|p|br|hr|h\d|article|b|dd|dl)[^>]*>/g, '\n') +} + export class AnalyzerHtml implements Analyzer { _content!: string @@ -28,7 +37,7 @@ export class AnalyzerHtml implements Analyzer { case 'innerHtml': return $.root().map((_, el) => $(el).html()).get().join('\n').trim() || '' case 'html': - return $.html() || '' + return getHtmlString($.html()) || '' } if (lastRule) return $(html || this._content).attr(lastRule)?.trim() || '' diff --git a/packages/core/src/analyzer/AnalyzerManager.ts b/packages/core/src/analyzer/AnalyzerManager.ts index bea0f2a7..c456aab7 100644 --- a/packages/core/src/analyzer/AnalyzerManager.ts +++ b/packages/core/src/analyzer/AnalyzerManager.ts @@ -283,7 +283,7 @@ export class AnalyzerManager { if (position < rule.length) rs.push(rule.substring(position)) - return rs + return rs.filter(e => e) } let temp: string | string[] = this._content diff --git a/packages/vscode/README.md b/packages/vscode/README.md index 768a1ddf..c04031ed 100644 --- a/packages/vscode/README.md +++ b/packages/vscode/README.md @@ -34,11 +34,13 @@

+QQ 群: 50057637 + ## 功能 - [x] 本地小说阅读 - - [x] txt格式 - - [x] epub格式 + - [x] txt 格式 + - [x] epub 格式 - [x] 小说章节识别 - [x] 在线小说阅读 - [x] 自定义书源规则 @@ -90,6 +92,15 @@ ![image](https://github.com/aooiuu/any-reader/assets/28108111/d4c1eb85-e90a-45e6-98b8-420992a216e5) +### 桌面端 + +[文档](https://aooiuu.github.io/any-reader/desktop/) + +| - | - | +| :-------------------------------------------------------------------------------------------------: | :-------------------------------------------------------------------------------------------------: | +| ![image](https://github.com/aooiuu/any-reader/assets/28108111/bf5b9edf-8b1e-4db5-adfb-1b1300f57a4a) | ![image](https://github.com/aooiuu/any-reader/assets/28108111/3d001367-ff2d-4339-a617-0700b492f601) | +| ![image](https://github.com/aooiuu/any-reader/assets/28108111/1e8fcb4e-2ca5-49a9-ba7e-d5c7ac19856b) | ![image](https://github.com/aooiuu/any-reader/assets/28108111/a732f2ce-452e-4525-8059-7e1938fcbe01) | + ## Star History [![Star History Chart](https://api.star-history.com/svg?repos=aooiuu/any-reader&type=Date)](https://star-history.com/#aoouuu/any-reade&aooiuu/any-reader&Date) diff --git a/packages/vscode/package.json b/packages/vscode/package.json index d499c2ab..0149ef5e 100644 --- a/packages/vscode/package.json +++ b/packages/vscode/package.json @@ -3,7 +3,7 @@ "displayName": "any-reader", "description": "摸鱼,自定义规则多站点聚合搜索阅读小说、漫画。包含JS规则解析库和VSCode插件。支持本地小说 TXT、EPUB", "icon": "resources/icon.png", - "version": "1.3.5", + "version": "1.3.6", "publisher": "aooiu", "qna": "https://github.com/aooiuu/any-reader/issues", "bugs": { diff --git a/packages/web/package.json b/packages/web/package.json index ebfa4693..c6eb5159 100644 --- a/packages/web/package.json +++ b/packages/web/package.json @@ -1,6 +1,6 @@ { "name": "any-reader-web", - "version": "1.0.0-dev.8", + "version": "1.0.0-dev.10", "private": true, "scripts": { "dev": "cross-env VITE_APP_PLATFORM=browser vite",