Удалил более не нужный restoreOldSettings

client/components/Reader/Reader.vue

@@ -101,7 +101,6 @@ import ServerStorage from './ServerStorage/ServerStorage.vue';
 import bookManager from './share/bookManager';
 import readerApi from '../../api/reader';
 import * as utils from '../../share/utils';
-import restoreOldSettings from './share/restoreOldSettings';
 
 export default @Component({
     components: {
@@ -208,7 +207,6 @@ class Reader extends Vue {
     mounted() {
         (async() => {
             await bookManager.init(this.settings);
-            await restoreOldSettings(this.settings, bookManager, this.commit);
             await this.$refs.serverStorage.init();
 
             if (this.$root.rootRoute == '/reader') {
@@ -674,7 +672,6 @@ class Reader extends Vue {
                 wasOpened = (wasOpened ? wasOpened : {});
                 const bookPos = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPos);
                 const bookPosSeen = (opts.bookPos !== undefined ? opts.bookPos : wasOpened.bookPosSeen);
-                const bookPosPercent = wasOpened.bookPosPercent;
 
                 let book = null;
 
@@ -686,7 +683,7 @@ class Reader extends Vue {
 
                     // если есть в локальном кэше
                     if (bookParsed) {
-                        await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen, bookPosPercent}, bookParsed));
+                        await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen}, bookParsed));
                         this.mostRecentBook();
                         this.addAction(bookPos);
                         this.loaderActive = false;
@@ -729,7 +726,7 @@ class Reader extends Vue {
                 });
 
                 // добавляем в историю
-                await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen, bookPosPercent}, addedBook));
+                await bookManager.setRecentBook(Object.assign({bookPos, bookPosSeen}, addedBook));
                 this.mostRecentBook();
                 this.addAction(bookPos);
                 this.updateRoute(true);

client/components/Reader/share/bookManager.js

@@ -237,11 +237,7 @@ class BookManager {
         if (!this.recent) 
             await this.init();
         const result = this.metaOnly(value);
-        if (!noTouch)
-            result.touchTime = Date.now();
-
-        if (result.textLength && !result.bookPos && result.bookPosPercent)
-            result.bookPos = Math.round(result.bookPosPercent*result.textLength);
+        result.touchTime = Date.now();
 
         this.recent[result.key] = result;
 

client/components/Reader/share/restoreOldSettings.js

@@ -1,70 +0,0 @@
-export default async function restoreOldSettings(settings, bookManager, commit) {
-    const oldSets = localStorage['colorSetting'];
-    let isOld = false;
-    for (let i = 0; i < localStorage.length; i++) {
-        let key = unescape(localStorage.key(i));
-        if (key.indexOf('bpr-book-') == 0)
-            isOld = true;
-    }
-
-    if (isOld || oldSets) {
-        let newSettings = null;
-        if (oldSets) {
-            const [textColor, backgroundColor, lineStep, , , statusBarHeight, scInt] = unescape(oldSets).split('|');
-
-            const fontSize = Math.round(lineStep*0.8);
-            const scrollingDelay = fontSize*scInt;
-
-            newSettings = Object.assign({}, settings, {
-                textColor,
-                backgroundColor,
-                fontSize,
-                statusBarHeight: statusBarHeight*1,
-                scrollingDelay,
-            });
-        }
-
-        for (let i = 0; i < localStorage.length; i++) {
-            let key = localStorage.key(i);
-            if (key.indexOf('bpr-') == 0) {
-                let v = unescape(localStorage[key]);
-                key = unescape(key);
-
-                if (key.lastIndexOf('=timestamp') == key.length - 10) {
-                    continue;
-                }
-
-                if (key.indexOf('bpr-book-') == 0) {
-                    const url = key.substr(9);
-                    const [scrollTop, scrollHeight, ] = v.split('|');
-
-                    const bookPosPercent = scrollTop*1/(scrollHeight*1 + 1);
-                    const title = unescape(localStorage[`bpr-title-${escape(url)}`]);
-                    const author = unescape(localStorage[`bpr-author-${escape(url)}`]);
-                    const time = unescape(localStorage[`bpr-book-${escape(url)}=timestamp`]).split(';')[0];
-                    const touchTime = Date.parse(time);
-
-                    const bookKey = bookManager.keyFromUrl(url);
-                    const recent = await bookManager.getRecentBook({key: bookKey});
-
-                    if (!recent) {
-                        await bookManager.setRecentBook({
-                            key: bookKey,
-                            touchTime,
-                            bookPosPercent,
-                            url,
-                            fb2: {
-                                bookTitle: title,
-                                lastName: author,
-                            }
-                        }, true);
-                    }
-                }
-            }
-        }
-
-        localStorage.clear();
-        if (oldSets)
-            commit('reader/setSettings', newSettings);
-    }
-}