From 1d2ca75a7bcb15dd404b68cfa95bcdf8fd9b9ac2 Mon Sep 17 00:00:00 2001 From: Vitaly Gashkov Date: Sat, 30 Nov 2024 01:38:39 +0500 Subject: [PATCH 1/2] fix: temporary rollback store init function --- apps/cli | 2 +- packages/core/lib/store.ts | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/apps/cli b/apps/cli index 836134d..d3e4b9a 160000 --- a/apps/cli +++ b/apps/cli @@ -1 +1 @@ -Subproject commit 836134d1a474de1a1cc88d38e66727ee8001999c +Subproject commit d3e4b9a84ffe98452c7b24340d4949e5a6bae2cf diff --git a/packages/core/lib/store.ts b/packages/core/lib/store.ts index 3c93f4c..5b81296 100644 --- a/packages/core/lib/store.ts +++ b/packages/core/lib/store.ts @@ -5,15 +5,18 @@ import { getSettings } from './settings'; import { importCookies } from './cookies'; const createStorePath = (name: string) => { + // TODO: Make new store filename format + // const storePath = join(getSettings().servicesDir, `${name}.json`); + // if (fs.exists(storePath)) return storePath; + + // Old store support const oldStoreDir = initDir(join(getSettings().servicesDir, name)); const oldStorePath = join(oldStoreDir, 'config.json'); - const storePath = join(getSettings().servicesDir, `${name}.json`); // Migrate from old store to new store - if (fs.exists(oldStorePath)) { - fs.renameSync(oldStorePath, storePath); - fs.delete(oldStorePath).then(() => fs.delete(oldStoreDir)); - } - return storePath; + // if (fs.exists(oldStorePath)) { + // fs.readText(oldStorePath).then((data) => fs.writeText(storePath, data)); + // } + return oldStorePath; }; const getCookiesFromTxt = async (dir: string) => { From f594e53edd0b3341e24386c401cf975ec95aba47 Mon Sep 17 00:00:00 2001 From: Vitaly Gashkov Date: Sat, 30 Nov 2024 01:39:58 +0500 Subject: [PATCH 2/2] update submodule --- apps/cli | 2 +- package-lock.json | 2 +- packages/molnia | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/cli b/apps/cli index d3e4b9a..978bcc8 160000 --- a/apps/cli +++ b/apps/cli @@ -1 +1 @@ -Subproject commit d3e4b9a84ffe98452c7b24340d4949e5a6bae2cf +Subproject commit 978bcc8f35e3d6f6a2040189c776d87b9e3b44b3 diff --git a/package-lock.json b/package-lock.json index bf6e068..7c78cd0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -19,7 +19,7 @@ }, "apps/cli": { "name": "@streamyx/cli", - "version": "4.1.4", + "version": "4.1.5", "hasInstallScript": true, "dependencies": { "azot": "^0.6.1", diff --git a/packages/molnia b/packages/molnia index ae967fc..9b0096e 160000 --- a/packages/molnia +++ b/packages/molnia @@ -1 +1 @@ -Subproject commit ae967fcb311b37677968e60e9006f1709e34f469 +Subproject commit 9b0096e80286f2ca0f9115fc18bf030b7e9eb9d2