Merge branch 'release/0.6.3'

0.6.2

client/components/Reader/ServerStorage/ServerStorage.vue

@@ -75,7 +75,12 @@ class ServerStorage extends Vue {
     async serverSyncEnabledChanged() {
         if (this.serverSyncEnabled) {
             this.prevServerStorageKey = null;
-            await this.serverStorageKeyChanged(true);
+            if (!this.serverStorageKey) {
+                //генерируем новый ключ
+                await this.generateNewServerStorageKey();
+            } else {
+                await this.serverStorageKeyChanged(true);
+            }
         }
     }
 

client/components/Reader/SettingsPage/SettingsPage.vue

@@ -751,12 +751,12 @@ class SettingsPage extends Vue {
                 dangerouslyUseHTMLString: true,
                 confirmButtonText: 'OK',
                 cancelButtonText: 'Отмена',
-                inputValidator: (str) => { if (str && str.length == 44) return true; else return 'Неверный формат ключа'; },
+                inputValidator: (str) => { if (str && utils.fromBase58(str).length == 32) return true; else return 'Неверный формат ключа'; },
                 inputValue: (key && _.isString(key) ? key : null),
                 type: 'warning'
             });
 
-            if (result.value && result.value.length == 44) {
+            if (result.value && utils.fromBase58(result.value).length == 32) {
                 this.commit('reader/setServerStorageKey', result.value);
             }
         } catch (e) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Liberama",
-  "version": "0.6.0",
+  "version": "0.6.3",
   "engines": {
     "node": ">=10.0.0"
   },

server/db/connManager.js

@@ -22,7 +22,8 @@ class ConnManager {
             const dbFileName = this.config.dataDir + '/' + poolConfig.fileName;
 
             //бэкап
-            await fs.copy(dbFileName, `${dbFileName}.bak`);
+            if (await fs.pathExists(dbFileName))
+                await fs.copy(dbFileName, `${dbFileName}.bak`);
 
             const connPool = new SqliteConnectionPool();
             await connPool.open(poolConfig.connCount, dbFileName);