FreshRSS/FluentReader
1
0
Fork 0
mirror of https://github.com/yang991178/fluent-reader.git synced 2025-03-01 18:07:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

beta release build 0.7.2

Browse Source
This commit is contained in:
刘浩远 2020-08-13 10:50:15 +08:00
parent 31b13aa943
commit af5fd44ef9
4 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "fluent-reader", "name": "fluent-reader",
"version": "0.7.1", "version": "0.7.2",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "fluent-reader", "name": "fluent-reader",
"version": "0.7.1", "version": "0.7.2",
"description": "Modern desktop RSS reader", "description": "Modern desktop RSS reader",
"main": "./dist/electron.js", "main": "./dist/electron.js",
"scripts": { "scripts": {

1
src/main/window.ts
View File

@ -60,6 +60,7 @@ export class WindowManager {
webviewTag: true, webviewTag: true,
enableRemoteModule: false, enableRemoteModule: false,
contextIsolation: true, contextIsolation: true,
worldSafeExecuteJavaScript: true,
spellcheck: false, spellcheck: false,
preload: path.join(app.getAppPath(), (app.isPackaged ? "dist/" : "") + "preload.js") preload: path.join(app.getAppPath(), (app.isPackaged ? "dist/" : "") + "preload.js")
} }

10
src/scripts/utils.ts
View File

@ -29,18 +29,22 @@ const rssParser = new Parser({
}) })
const CHARSET_RE = /charset=([^()<>@,;:\"/[\]?.=\s]*)/i const CHARSET_RE = /charset=([^()<>@,;:\"/[\]?.=\s]*)/i
const XML_ENCODING_RE = /^<\?xml.+encoding="(.+)".*\?>\s*\n/i const XML_ENCODING_RE = /^<\?xml.+encoding="(.+)".*?\?>/i
export async function decodeFetchResponse(response: Response, isHTML = false) { export async function decodeFetchResponse(response: Response, isHTML = false) {
const buffer = await response.arrayBuffer() const buffer = await response.arrayBuffer()
const ctype = response.headers.has("content-type") && response.headers.get("content-type") let ctype = response.headers.has("content-type") && response.headers.get("content-type")
let charset = (ctype && CHARSET_RE.test(ctype)) ? CHARSET_RE.exec(ctype)[1] : undefined let charset = (ctype && CHARSET_RE.test(ctype)) ? CHARSET_RE.exec(ctype)[1] : undefined
let content = (new TextDecoder(charset)).decode(buffer) let content = (new TextDecoder(charset)).decode(buffer)
if (charset === undefined) { if (charset === undefined) {
if (isHTML) { if (isHTML) {
const dom = domParser.parseFromString(content, "text/html") const dom = domParser.parseFromString(content, "text/html")
charset = dom.querySelector("meta[charset]")?.getAttribute("charset")?.toLowerCase() charset = dom.querySelector("meta[charset]")?.getAttribute("charset")?.toLowerCase()
if (!charset) {
ctype = dom.querySelector("meta[http-equiv='Content-Type']")?.getAttribute("content")
charset = ctype && CHARSET_RE.test(ctype) && CHARSET_RE.exec(ctype)[1].toLowerCase()
}
} else { } else {
charset = (XML_ENCODING_RE.test(content) && XML_ENCODING_RE.exec(content)[1])?.toLowerCase() charset = XML_ENCODING_RE.test(content) && XML_ENCODING_RE.exec(content)[1].toLowerCase()
} }
if (charset && charset !== "utf-8" && charset !== "utf8") { if (charset && charset !== "utf-8" && charset !== "utf8") {
content = (new TextDecoder(charset)).decode(buffer) content = (new TextDecoder(charset)).decode(buffer)