From 30a1629f234a0161889a5bd844b60c5ea34a6f4a Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Thu, 3 Oct 2024 15:38:16 +0700 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B8=D0=B7-=D0=B7=D0=B0=20=D0=BD?= =?UTF-8?q?=D0=B0=D1=80=D1=83=D1=88=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B0=D0=B2?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D1=81=D0=BA=D0=B8=D1=85=20=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/components/Reader/Reader.vue | 20 ++++++++++++++++++- client/components/Reader/share/bmHelper.js | 8 -------- client/components/Reader/share/bookManager.js | 20 +------------------ client/components/Reader/versionHistory.js | 2 +- package.json | 2 +- 5 files changed, 22 insertions(+), 30 deletions(-) delete mode 100644 client/components/Reader/share/bmHelper.js diff --git a/client/components/Reader/Reader.vue b/client/components/Reader/Reader.vue index 00949ab3..a552907b 100644 --- a/client/components/Reader/Reader.vue +++ b/client/components/Reader/Reader.vue @@ -416,7 +416,7 @@ class Reader { await wallpaperStorage.init(); await coversStorage.init(); - await bookManager.init(this.settings, this.restricted); + await bookManager.init(this.settings); bookManager.addEventListener(this.bookManagerEvent); if (this.$root.getRootRoute() == '/reader') { @@ -1267,6 +1267,19 @@ class Reader { return result; } + isUrlAllowed(url) { + const restrictedSites = this.restricted?.sites; + if (restrictedSites) { + url = url.toLowerCase(); + for (const site of restrictedSites) { + if (url.indexOf(site) === 0) + return false; + } + } + + return true; + } + async _loadBook(opts) { if (!opts || !opts.url) { this.mostRecentBook(); @@ -1277,6 +1290,11 @@ class Reader { let url = encodeURI(decodeURI(opts.url)); + if (!this.isUrlAllowed(url)) { + this.$root.stdDialog.alert('Книга не загружена, причина: нарушение авторских прав.
Приносим извинения за неудобство.', '', {color: 'negative'}); + return; + } + if ((url.indexOf('http://') != 0) && (url.indexOf('https://') != 0) && (url.indexOf('disk://') != 0)) url = 'http://' + url; diff --git a/client/components/Reader/share/bmHelper.js b/client/components/Reader/share/bmHelper.js deleted file mode 100644 index fa946cdc..00000000 --- a/client/components/Reader/share/bmHelper.js +++ /dev/null @@ -1,8 +0,0 @@ -export default { - restrictedData: ` - -Нарушение авторских прав -

Книга не загружена по причине нарушения авторских прав.

-`, - -}; \ No newline at end of file diff --git a/client/components/Reader/share/bookManager.js b/client/components/Reader/share/bookManager.js index 4f69bb92..73b7c390 100644 --- a/client/components/Reader/share/bookManager.js +++ b/client/components/Reader/share/bookManager.js @@ -3,7 +3,6 @@ import path from 'path-browserify'; import _ from 'lodash'; import BookParser from './BookParser'; -import bmHelper from './bmHelper'; import readerApi from '../../../api/reader'; import coversStorage from './coversStorage'; import * as utils from '../../../share/utils'; @@ -27,10 +26,9 @@ const bmRecentStoreNew = localForage.createInstance({ }); class BookManager { - async init(settings, restricted) { + async init(settings) { this.loaded = false; this.settings = settings; - this.restricted = restricted; this.eventListeners = []; this.books = {}; @@ -234,18 +232,6 @@ class BookManager { return inflator.result; } - isUrlAllowed(url) { - const restrictedSites = this.restricted?.sites; - if (restrictedSites) { - for (const site of restrictedSites) { - if (url.indexOf(site) === 0) - return false; - } - } - - return true; - } - async addBook(newBook, callback) { let meta = {url: newBook.url, path: newBook.path}; @@ -362,10 +348,6 @@ class BookManager { } async parseBook(meta, data, callback) { - if (!this.isUrlAllowed(meta.url)) { - data = bmHelper.restrictedData; - } - const parsed = new BookParser(this.settings); const parsedMeta = await parsed.parse(data, callback); diff --git a/client/components/Reader/versionHistory.js b/client/components/Reader/versionHistory.js index b9c84790..c05a13c3 100644 --- a/client/components/Reader/versionHistory.js +++ b/client/components/Reader/versionHistory.js @@ -1,6 +1,6 @@ export const versionHistory = [ { - version: '1.2.5', + version: '1.2.6', releaseDate: '2024-10-03', showUntil: '2024-10-02', content: diff --git a/package.json b/package.json index bccfac5a..7059f5ec 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "liberama", - "version": "1.2.5", + "version": "1.2.6", "author": "Book Pauk ", "license": "CC0-1.0", "repository": "bookpauk/liberama",