8000 WIP · sidworks-dev/sw-db-sync@59b3bdf · GitHub
[go: up one dir, main page]
Skip to content

Commit 59b3bdf

Browse files
jellesideriusjellesiderius
committed
WIP
1 parent 54f61d6 commit 59b3bdf

File tree

6 files changed

+20
-16
lines changed

6 files changed

+20
-16
lines changed

‎dist/controllers/mainController.js

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/controllers/mainController.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/tasks/downloadTask.js

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/tasks/downloadTask.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/controllers/mainController.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ class MainController {
3131
'currentFolder': '',
3232
'currentFolderName': '',
3333
'databaseFileName': '',
34+
'databaseFullPath': '',
3435
'strip': '',
3536
'syncImages': false,
3637
'magentoLocalhostDomainName': '',

‎src/tasks/downloadTask.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,12 @@ class DownloadTask {
9595
port = databaseDetails.port;
9696
database = databaseDetails.database;
9797

98-
config.settings.databaseFileName = database + '.gz';
98+
config.settings.databaseFileName = database;
9999
}
100100
});
101101

102-
// Dump database, database name will be "shopware6-database-dump.gz"
103-
var dumpCommand = `sh shopware6-database-dump.sh -d ${database} -u ${username} -pa ${password} --host ${host} -p ${port}; mv ${config.settings.databaseFileName} ~`;
102+
// Dump database, database name will be "shopware6-database-dump.sql"
103+
var dumpCommand = `sh shopware6-database-dump.sh -d ${database} -u ${username} -pa ${password} --host ${host} -p ${port}; mv ${config.settings.databaseFileName}.sql ~`;
104104
await ssh.execCommand(sshNavigateToShopwareRootCommand(dumpCommand, config));
105105
}
106106
}
@@ -112,19 +112,20 @@ class DownloadTask {
112112
task: async (): Promise<void> => {
113113
// Download file and place it on localhost
114114
let localDatabaseFolderLocation = config.customConfig.localDatabaseFolderLocation;
115-
let localDatabaseLocation = localDatabaseFolderLocation + `/${config.settings.databaseFileName}`;
115+
let localDatabaseLocation = localDatabaseFolderLocation + `/${config.settings.databaseFileName}.sql`;
116116

117117
if (config.settings.rsyncInstalled D15E ) {
118-
await localhostRsyncDownloadCommand(`~/${config.settings.databaseFileName}`, `${localDatabaseFolderLocation}`, config);
118+
await localhostRsyncDownloadCommand(`~/${config.settings.databaseFileName}.sql`, `${localDatabaseFolderLocation}`, config);
119119
} else {
120-
await ssh.getFile(localDatabaseLocation, config.settings.databaseFileName).then(function (Contents: any) {
120+
await ssh.getFile(localDatabaseLocation, config.settings.databaseFileName + '.sql').then(function (Contents: any) {
121121
}, function (error: any) {
122122
throw new Error(error)
123123
});
124124
}
125125

126126
// Set final message with Shopware 6 DB location
127127
config.finalMessages.magentoDatabaseLocation = localDatabaseLocation;
128+
config.settings.databaseFullPath = localDatabaseFolderLocation;
128129
}
129130
}
130131
);
@@ -134,7 +135,7 @@ class DownloadTask {
134135
title: 'Cleaning up and closing SSH connection',
135136
task: async (): Promise<void> => {
136137
// Remove the Shopware 6 database file on the server
137-
await ssh.execCommand(`rm ${config.settings.databaseFileName}`);
138+
await ssh.execCommand(`rm ${config.settings.databaseFileName}.sql`);
138139

139140
// Remove database dump file and close connection to SSH
140141
await ssh.execCommand(sshNavigateToShopwareRootCommand('rm shopware6-database-dump.sh', config));

0 commit comments

Comments
 (0)
0