dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-19 22:26:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

renamed dbgate-data to .dbgate #248

Browse Source
This commit is contained in:
Jan Prochazka
2022-05-17 21:05:48 +02:00
parent eeb52b9a41
commit ce4124caef
6 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/electron.js
View File

@@ -32,15 +32,6 @@ try {
initialConfig = {}; initialConfig = {};
} }
// let settingsJson = {};
// try {
// const datadir = path.join(os.homedir(), 'dbgate-data');
// settingsJson = JSON.parse(fs.readFileSync(path.join(datadir, 'settings.json'), { encoding: 'utf-8' }));
// } catch (err) {
// console.log('Error loading settings.json:', err.message);
// settingsJson = {};
// }
// Keep a global reference of the window object, if you don't, the window will // Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the JavaScript object is garbage collected. // be closed automatically when the JavaScript object is garbage collected.
let mainWindow; let mainWindow;
@@ -252,7 +243,7 @@ function fillMissingSettings(value) {
function createWindow() { function createWindow() {
let settingsJson = {}; let settingsJson = {};
try { try {
const datadir = path.join(os.homedir(), 'dbgate-data'); const datadir = path.join(os.homedir(), '.dbgate');
settingsJson = fillMissingSettings( settingsJson = fillMissingSettings(
JSON.parse(fs.readFileSync(path.join(datadir, 'settings.json'), { encoding: 'utf-8' })) JSON.parse(fs.readFileSync(path.join(datadir, 'settings.json'), { encoding: 'utf-8' }))
); );

2
docker-compose.yaml
View File

@@ -14,7 +14,7 @@ services:
# - /home/jena/dbgate-data:/root/dbgate-data # - /home/jena/dbgate-data:/root/dbgate-data
volumes: volumes:
- dbgate-data:/root/dbgate-data - dbgate-data:/root/.dbgate
# environment: # environment:
# WEB_ROOT: /dbgate # WEB_ROOT: /dbgate

2
docker/Dockerfile
View File

@@ -13,6 +13,6 @@ RUN ["chmod", "+x", "/home/dbgate-docker/entrypoint.sh"]
WORKDIR /home/dbgate-docker WORKDIR /home/dbgate-docker
EXPOSE 3000 EXPOSE 3000
VOLUME /root/dbgate-data VOLUME /root/.dbgate
CMD ["/home/dbgate-docker/entrypoint.sh"] CMD ["/home/dbgate-docker/entrypoint.sh"]

2
docker/Dockerfile-alpine
View File

@@ -12,6 +12,6 @@ RUN ["chmod", "+x", "/home/dbgate-docker/entrypoint.sh"]
WORKDIR /home/dbgate-docker WORKDIR /home/dbgate-docker
EXPOSE 3000 EXPOSE 3000
VOLUME /root/dbgate-data VOLUME /root/.dbgate
CMD ["/home/dbgate-docker/entrypoint.sh"] CMD ["/home/dbgate-docker/entrypoint.sh"]

2
packages/api/env/portal/.env vendored
View File

@@ -38,7 +38,7 @@ SSH_LOGIN_mysqlssh=root
SSH_PASSWORD_mysqlssh=xxx SSH_PASSWORD_mysqlssh=xxx
LABEL_sqlite=sqlite LABEL_sqlite=sqlite
FILE_sqlite=/home/jena/dbgate-data/files/sqlite/feeds.sqlite FILE_sqlite=/home/jena/.dbgate/files/sqlite/feeds.sqlite
ENGINE_sqlite=sqlite@dbgate-plugin-sqlite ENGINE_sqlite=sqlite@dbgate-plugin-sqlite
# docker run -p 3000:3000 -e CONNECTIONS=mongo -e URL_mongo=mongodb://localhost:27017 -e ENGINE_mongo=mongo@dbgate-plugin-mongo -e LABEL_mongo=mongo dbgate/dbgate:beta # docker run -p 3000:3000 -e CONNECTIONS=mongo -e URL_mongo=mongodb://localhost:27017 -e ENGINE_mongo=mongo@dbgate-plugin-mongo -e LABEL_mongo=mongo dbgate/dbgate:beta

24
packages/api/src/utility/directories.js
View File

@@ -4,6 +4,7 @@ const fs = require('fs');
const cleanDirectory = require('./cleanDirectory'); const cleanDirectory = require('./cleanDirectory');
const platformInfo = require('./platformInfo'); const platformInfo = require('./platformInfo');
const processArgs = require('./processArgs'); const processArgs = require('./processArgs');
const consoleObjectWriter = require('../shell/consoleObjectWriter');
const createDirectories = {}; const createDirectories = {};
const ensureDirectory = (dir, clean) => { const ensureDirectory = (dir, clean) => {
@@ -27,7 +28,7 @@ function datadirCore() {
if (processArgs.workspaceDir) { if (processArgs.workspaceDir) {
return processArgs.workspaceDir; return processArgs.workspaceDir;
} }
return path.join(os.homedir(), 'dbgate-data'); return path.join(os.homedir(), '.dbgate');
} }
function datadir() { function datadir() {
@@ -112,6 +113,27 @@ function clearArchiveLinksCache() {
archiveLinksCache = {}; archiveLinksCache = {};
} }
function migrateDataDir() {
if (process.env.WORKSPACE_DIR) {
return;
}
if (processArgs.workspaceDir) {
return;
}
try {
const oldDir = path.join(os.homedir(), 'dbgate-data');
const newDir = path.join(os.homedir(), '.dbgate');
if (fs.existsSync(oldDir) && !fs.existsSync(newDir)) {
fs.renameSync(oldDir, newDir);
}
} catch (e) {
console.log('Error migrating data dir:', e.message);
}
}
migrateDataDir();
module.exports = { module.exports = {
datadir, datadir,
jsldir, jsldir,