Home Esplora Aiuto
Registrati Accedi
oleg
/
liberama
1
0
Forka 0
File Problemi 0 Pull Requests 0 Wiki
Sfoglia il codice sorgente

Merge branch 'release/1.2.5'

Book Pauk 7 mesi fa
parent
be6d60d7a9 3e75310e1f
commit
3c0d784e3d
9 ha cambiato i file con 63 aggiunte e 7 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 2 1
      client/api/misc.js
  2. 5 1
      client/components/Reader/Reader.vue
  3. 8 0
      client/components/Reader/share/bmHelper.js
  4. 19 1
      client/components/Reader/share/bookManager.js
  5. 13 0
      client/components/Reader/versionHistory.js
  6. 2 2
      package-lock.json
  7. 1 1
      package.json
  8. 2 1
      server/config/base.js
  9. 11 0
      server/config/index.js

+ 2 - 1
client/api/misc.js
Vedi File 

@@ -4,7 +4,8 @@ class Misc {
 
     async loadConfig() {
 
 
         const query = {params: [
 
-            'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch', 'networkLibraryLink',
 
+            'name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter',
 
+            'acceptFileExt', 'bucEnabled', 'branch', 'networkLibraryLink', 'restricted'
 
         ]};
 
 
         const config = await wsc.message(await wsc.send(Object.assign({action: 'get-config'}, query)));

+ 5 - 1
client/components/Reader/Reader.vue
Vedi File 

@@ -416,7 +416,7 @@ class Reader {
 
             await wallpaperStorage.init();
 
             await coversStorage.init();
 
             
-            await bookManager.init(this.settings);
 
+            await bookManager.init(this.settings, this.restricted);
 
             bookManager.addEventListener(this.bookManagerEvent);
 
 
             if (this.$root.getRootRoute() == '/reader') {
 
@@ -770,6 +770,10 @@ class Reader {
 
         return this.$store.state.config.bucEnabled && this.bucEnabled;
 
     }
 
 
+    get restricted() {
 
+        return this.$store.state.config.restricted;
 
+    }
 
+
 
     get routeParamUrl() {
 
         let result = '';
 
         const path = this.$route.fullPath;

+ 8 - 0
client/components/Reader/share/bmHelper.js
Vedi File 

@@ -0,0 +1,8 @@
 
+export default {
 
+    restrictedData: `<?xml version="1.0" encoding="utf-8"?>
 
+<FictionBook xmlns="http://www.gribuser.ru/xml/fictionbook/2.0" xmlns:l="http://www.w3.org/1999/xlink">
 
+<description><title-info><book-title>Нарушение авторских прав</book-title></title-info></description>
 
+<body><section><p>Книга не загружена по причине нарушения авторских прав.</p></section></body>
 
+</FictionBook>`,
 
+
 
+};

+ 19 - 1
client/components/Reader/share/bookManager.js
Vedi File 

@@ -3,6 +3,7 @@ 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';
 
@@ -26,9 +27,10 @@ const bmRecentStoreNew = localForage.createInstance({
 
 });
 
 
 class BookManager {
 
-    async init(settings) {
 
+    async init(settings, restricted) {
 
         this.loaded = false;
 
         this.settings = settings;
 
+        this.restricted = restricted;
 
 
         this.eventListeners = [];
 
         this.books = {};
 
@@ -232,6 +234,18 @@ 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};
 
 
@@ -348,6 +362,10 @@ 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);

+ 13 - 0
client/components/Reader/versionHistory.js
Vedi File 

@@ -1,4 +1,17 @@
 
 export const versionHistory = [
 
+{
 
+    version: '1.2.5',
 
+    releaseDate: '2024-10-03',
 
+    showUntil: '2024-10-02',
 
+    content:
 
+`
 
+<ul>
 
+    <li>исправления из-за нарушения авторских прав</li>
 
+</ul>
 
+
 
+`
 
+},
 
+
 
 {
 
     version: '1.2.4',
 
     releaseDate: '2024-08-27',

+ 2 - 2
package-lock.json
Vedi File 

@@ -1,12 +1,12 @@
 
 {
 
   "name": "liberama",
 
-  "version": "1.2.3",
 
+  "version": "1.2.5",
 
   "lockfileVersion": 2,
 
   "requires": true,
 
   "packages": {
 
     "": {
 
       "name": "liberama",
 
-      "version": "1.2.3",
 
+      "version": "1.2.5",
 
       "hasInstallScript": true,
 
       "license": "CC0-1.0",
 
       "dependencies": {

+ 1 - 1
package.json
Vedi File 

@@ -1,6 +1,6 @@
 
 {
 
   "name": "liberama",
 
-  "version": "1.2.4",
 
+  "version": "1.2.5",
 
   "author": "Book Pauk <bookpauk@gmail.com>",
 
   "license": "CC0-1.0",
 
   "repository": "bookpauk/liberama",

+ 2 - 1
server/config/base.js
Vedi File 

@@ -18,7 +18,8 @@ module.exports = {
 
 
     useExternalBookConverter: false,
 
     acceptFileExt: '.fb2, .fb3, .html, .txt, .zip, .bz2, .gz, .rar, .epub, .mobi, .rtf, .doc, .docx, .pdf, .djvu, .jpg, .jpeg, .png',
 
-    webConfigParams: ['name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch', 'networkLibraryLink'],
 
+    restricted: {},
 
+    webConfigParams: ['name', 'version', 'mode', 'maxUploadFileSize', 'useExternalBookConverter', 'acceptFileExt', 'bucEnabled', 'branch', 'networkLibraryLink', 'restricted'],
 
 
     jembaDb: [
 
         {

+ 11 - 0
server/config/index.js
Vedi File 

@@ -56,6 +56,7 @@ class ConfigManager {
 
 
         await fs.ensureDir(config.dataDir);
 
         this._userConfigFile = `${config.dataDir}/config.json`;
 
+        this._restrictedFile = `${config.dataDir}/restricted.json`;
 
         this._config = config;
 
 
         this.inited = true;
 
@@ -75,6 +76,10 @@ class ConfigManager {
 
         return this._userConfigFile;
 
     }
 
 
+    get restrictedFile() {
 
+        return this._restrictedFile;
 
+    }
 
+
 
     set userConfigFile(value) {
 
         if (value)
 
             this._userConfigFile = value;
 
@@ -100,6 +105,12 @@ class ConfigManager {
 
             } else {
 
                 await this.save();
 
             }
 
+
 
+            if (await fs.pathExists(this.restrictedFile)) {
 
+                const data = JSON.parse(await fs.readFile(this.restrictedFile, 'utf8'));
 
+
 
+                this.config = {restricted: data};
 
+            }
 
         } catch(e) {
 
             throw new Error(`Error while loading "${this.userConfigFile}": ${e.message}`);
 
         }