refactorizando

Author: RolandoHidalgo

package.json

@@ -1,6 +1,6 @@
 {
   "name": "PgUiRestore",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "An Electron application with Vue and TypeScript",
   "main": "./out/main/index.js",
   "author": "RolandoHidalgo",

src/main/index.ts

@@ -109,7 +109,7 @@ app.whenReady().then(() => {
   app.commandLine.appendSwitch('lang', 'es')
   // Set app user model id for windows
   electronApp.setAppUserModelId('com.electron.pgUI-restore')
-  console.log(app.getVersion(), 'la versionnnn')
+
   // Default open or close DevTools by F12 in development
   // and ignore CommandOrControl + R in production.
   // see https://github.com/alex8088/electron-toolkit/tree/master/packages/utils
@@ -131,13 +131,13 @@ app.whenReady().then(() => {
   })
 
   ipcMain.on('create-db', (event, dbOptions, createDbOptions) => {
-    console.log('create-db', dbOptions)
+
     createDb(dbOptions, createDbOptions, event)
 
   })
 
   ipcMain.on('clone-db', (event, dbOptions, createDbOptions) => {
-    console.log('clone-db', dbOptions)
+
     cloneDb(dbOptions, createDbOptions, event)
 
   })
@@ -175,7 +175,7 @@ app.whenReady().then(() => {
     const backupFile = process.argv.filter(e => {
       return e.toString().includes('.backup')
     })
-    console.log(backupFile[0], 'file')
+
     return backupFile.length > 0 ? backupFile[0] : null
 
 
@@ -188,7 +188,7 @@ app.whenReady().then(() => {
 
   })
   ipcMain.handle('get-dbs', async (event, name: string) => {
-    console.log('main con name', name)
+
     return getDatabaseByDatasource(name)
 
 
@@ -221,7 +221,7 @@ app.whenReady().then(() => {
   //   binary:'C:\\Program Files\\PostgreSQL\\13\\bin',
   //   name:'local'
   // })
-  // console.log('asdasdldldldldle3333',getDatasources())
+
   app.on('activate', function() {
     // On macOS it's common to re-create a window in the app when the
     // dock icon is clicked and there are no other windows open.

src/main/utils/restore/binariesUtils.ts

@@ -23,7 +23,7 @@ const getVersions = (basePath) => {
 }
 
 const findBinarys = () => {
-  console.log('el process desde el binary', process.argv)
+
   return basePathsArch.map((e) => (fs.existsSync(e) ? getVersions(e) : [])).flat()
 }
 export type BackupInfo = {
@@ -56,7 +56,7 @@ const parseBackup = async (dsName: string, backupPath: string): Promise<BackupIn
       info.dbName = getValueAfterDoublePoints(line)
     }
   })
-  console.log('infoLines', info)
+
   return info
 }
 const getValueAfterDoublePoints = (line: string, splitPattern = ':') => {

src/main/utils/restore/drivesUtils.ts

@@ -15,11 +15,11 @@ const getUSBDrives = async ():Promise<{name:string,mount:string}> => {
       }
 
       // Mostrar los puntos de montaje de las unidades extraíbles
-      console.log('Puntos de montaje de unidades USB:');
+
       const lines = stdout.trim().split('\n').slice(1); // Ignorar la cabecera
       res(lines.map((line) => {
         const [mount,name] = line.trim().split('2').map(usb=>usb.trim())
-        console.log(name,mount,fs.existsSync(resolve(mount)));
+
         return {name,mount:resolve(mount)}
       }))
     });

src/main/utils/restore/gitUtils.ts

@@ -44,24 +44,24 @@ const performGitFlow = async (cwd: string): Promise<void> => {
 
 const runCommand = async (cwd: string, exe: string, params: string): Promise<void> => {
   return new Promise((resolve, reject) => {
-    console.log(params)
+
     const paramsSplitted = params.toString().split(' ')
     const bat = spawn(exe, paramsSplitted, { cwd })
     bat.stdout.setEncoding('utf8')
     bat.stdout.on('data', (data: any) => {
-      console.log('data', data.toString())
+
     })
     bat.stderr.setEncoding('utf8')
     bat.stderr.on('data', (data: any) => {
-      console.log('error', data.toString())
+
     })
 
     bat.on('exit', (code: any) => {
-      console.log(`Child exited with code ${code}`)
+
       resolve()
     })
     bat.on('error', (code: any) => {
-      console.log(`error ${code}`)
+
       reject(code)
     })
   })
@@ -71,7 +71,7 @@ const execCommand = async (cwd: string, exe: string, params: string): Promise<st
   return new Promise((resolve, reject) => {
     exec(`${exe} ${params}`, { cwd }, (error, stdout, stderr) => {
       if (error) {
-        console.log(`error ${error}`)
+
         reject(`Error al ejecutar el comando: ${error.message}`)
         return
       }

src/main/utils/restore/regeditUtils.ts

@@ -5,10 +5,10 @@ import fs from "node:fs";
 
 import path from "node:path";
 
-console.log("sadasdasdasd");
+
 
 const writeChekFile = () => {
-  console.log("sadasdasdasd");
+
   try {
     fs.writeFileSync(getCheckFilePaht(), "true");
     // file written successfully
@@ -22,7 +22,7 @@ const isFisrtRun = () => {
 
 
   try {
-    console.log("is first??");
+
     return !fs.existsSync(getCheckFilePaht());
     // file written successfully
   } catch (err) {
@@ -32,21 +32,21 @@ const isFisrtRun = () => {
 };
 
 const getCheckFilePaht = () => {
-  console.log("check");
+
   const val = path.join(path.dirname(process.argv[0]), "apprun.info");
-  console.log(val);
+
   return val;
 };
 
 const squirrelStartupEvent = () => {
-  console.log("squirelllllllll");
+
   if (process.platform !== "win32" || process.env.WEBPACK_DEV_SERVER_URL) {
-    console.log("no instalar");
+
     return false;
   }
 
   if (isFisrtRun()) {
-    console.log("a instalarrrrrrrr");
+
     //... instantiate your ProgIds
     const progId = new ProgId({
       description: "Restaurar PostgreSQl .backup files",
@@ -64,11 +64,11 @@ const squirrelStartupEvent = () => {
     });
 
     progId.install().then((e) => {
-      console.log("el progId installed", e);
+
     });
 
     Regedit.installAll().then((e) => {
-      console.log("all process installed", e);
+
     });
     writeChekFile();
   }
@@ -77,7 +77,7 @@ const squirrelStartupEvent = () => {
 };
 
 const handleSquirell = () => {
-  console.log("handleeeeee");
+
   const handle = squirrelStartupEvent();
   if (handle) {
     //app.quit();

src/main/utils/restore/restore-db.ts

@@ -42,27 +42,27 @@ const restoreDb = (dbOptions: DbOptions, event: IpcMainEvent) => {
   paramsSplitted.push(path.normalize(backupPath));
 
 
-  console.log(binary, paramsSplitted.join(" "));
+
   const exe = path.join(binary, 'pg_restore.exe');
   const bat = spawn(exe, paramsSplitted, {env: {...process.env, PGPASSWORD: password}});
   getBrowserWindow(event)?.setProgressBar(2);
   bat.stdout.setEncoding("utf8");
   bat.stdout.on("data", (data: any) => {
-    console.log("data", data.toString());
+
     event.sender.send("restore-logs", data.toString());
   });
   bat.stderr.setEncoding("utf8");
   bat.stderr.on("data", (data: any) => {
-    console.log("error", data.toString());
+
     event.sender.send("restore-logs", data.toString());
   });
 
   bat.on("exit", (code: any) => {
-    console.log(`Child exited with code ${code}`);
+
     event.sender.send("restore-logs", `finish-OK`);
   });
   bat.on("error", (code: any) => {
-    console.log(`error ${code}`);
+
     event.sender.send("restore-logs", `error ${code}`);
   });
 };
@@ -84,7 +84,7 @@ function getFormattedDateTime() {
 function listDatabases(user: string, password: string, host: string, port: number, binary: string): Promise<string[]> {
   // Replace 'your_username' and 'your_password' with your credentials
 
-  console.log('listar con allamar con name', password);
+
   return new Promise((resolve, reject) => {
     const command = `"${binary}\\psql.exe" -U ${user} --host ${host} --port ${port} -c "\\l"`;
 
@@ -103,7 +103,7 @@ function listDatabases(user: string, password: string, host: string, port: numbe
       }
 
       // Process and print the output
-      console.log('Available Databases:');
+
       const lines = stdout.split('\n')
         .filter(line => line.includes('|'))
         .map(line => line.split('|')[0].trim())
@@ -142,7 +142,7 @@ const obtenerEsquemas = (ds: DataSource, dbName: string): Promise<string[]> => {
   });
 };
 const getDatabaseByDatasource = async (dataSourceName: string): Promise<string[]> => {
-  console.log('restore con con name', dataSourceName)
+
   const ds: DataSource = getDatasource(dataSourceName);
   return listDatabases(ds.username, ds.password, ds.host, ds.port, ds.binary);
 }
@@ -169,15 +169,13 @@ const backupDb = (dbOptions: DbOptions, event: IpcMainEvent):Promise<string> =>
     //const params = `-F c --host ${host} --port ${port} --username ${user} --role postgres --dbname ${dbName}`;
     let params = `--file ${path.normalize(backupPath)} --host ${host} --port ${port} --username ${user} --format=c --verbose${schammaParams} ${dbName}`;
 
-    console.log(params);
-    console.log(backupFullName);
-    console.log(backupPath);
+
     const paramsSplitted = params.toString().split(" ");
     //paramsSplitted.push(path.normalize(backupPath));
 
 
     const exe = path.join(binary, 'pg_dump.exe');
-    console.log(exe, paramsSplitted);
+
     const bat = spawn(exe, paramsSplitted, {env: {...process.env, PGPASSWORD: password}});
     getBrowserWindow(event)?.setProgressBar(2);
     bat.stdout.setEncoding("utf8");
@@ -233,14 +231,13 @@ const createDb = (dbOptions: DbOptions, createDbOptions: CreateDebOptions, event
   const paramsSplitted = params.toString().split(" ");
 
   const exe = path.join(binary, 'createdb.exe');
-  console.log(exe, paramsSplitted.join(" "));
-  console.log(createDbOptions);
+
 
   const bat = spawn(exe, paramsSplitted, {env: {...process.env, PGPASSWORD: password}});
   getBrowserWindow(event)?.setProgressBar(2);
 
   bat.stdout.setEncoding("utf8");
-  console.log('va a ejecutar')
+
   bat.stdout.on("data", (data: any) => {
     console.log("data", data.toString());
     event.sender.send("restore-logs", data.toString());
@@ -266,9 +263,9 @@ const createDb = (dbOptions: DbOptions, createDbOptions: CreateDebOptions, event
 
 const cloneDb = async (dbOptions: DbOptions, createDbOptions: CreateDebOptions, event: IpcMainEvent)=>{
   dbOptions.backupPath =  await backupDb(dbOptions,event)
-  console.log("backup backup database", dbOptions);
+
   dbOptions.dbName = dbOptions.targetCloneDbName
-  console.log("backup backup database", dbOptions);
+
   createDb(dbOptions,createDbOptions,event);
 }
 

src/preload/index.ts

@@ -15,22 +15,22 @@ const api = {
     dbOptions.host = ds?.host
     dbOptions.binary = ds?.binary
     dbOptions.port = ds?.port
-    console.log(dbOptions, 'optionss')
+
     return ipcRenderer.send('restore-db', dbOptions)
   },
   sincronizarUsb: (usbDrive: string) => ipcRenderer.send('sincronizar-usb', usbDrive),
   backupDb: (dbOptions: DbOptions) => {
-    console.log(dbOptions, 'optionss1')
+
     const ds: DataSource | undefined = getDatasources().filter(
       (e) => e.name === dbOptions.dsName
     )[0]
-    console.log(ds, 'el ds')
+
     dbOptions.user = ds?.username
     dbOptions.password = ds?.password
     dbOptions.host = ds?.host
     dbOptions.binary = ds?.binary
     dbOptions.port = ds?.port
-    console.log(dbOptions, 'optionss')
+
     ipcRenderer.send('backup-db', dbOptions)
   },
   addDatasource: async (ds: DataSource) => {
@@ -78,7 +78,7 @@ const api = {
     dbOptions.host = ds?.host
     dbOptions.binary = ds?.binary
     dbOptions.port = ds?.port
-    console.log(dbOptions, 'optionss')
+
     return ipcRenderer.send('create-db', dbOptions, createDbOptions)
   },
   cloneDb: (dbOptions: DbOptions, createDbOptions) => {
@@ -91,7 +91,7 @@ const api = {
     dbOptions.host = ds?.host
     dbOptions.binary = ds?.binary
     dbOptions.port = ds?.port
-    console.log(dbOptions, 'optionss')
+
     return ipcRenderer.send('clone-db', dbOptions, createDbOptions)
   },
   restoreFinish: () => ipcRenderer.send('restore-finish'),
@@ -104,7 +104,7 @@ const api = {
   getDrives: () => ipcRenderer.invoke('get-drives'),
   getDatasource: (): Promise<DataSource[]> => ipcRenderer.invoke('get-datasource'),
   getDbs: async (name: string) => {
-    console.log('allamar con name', name)
+
     return ipcRenderer.invoke('get-dbs', name)
   },
   getSchemmas: async (dsName: string, dbName: string) => {

src/renderer/src/components/AddDatasourceDialog.vue

@@ -85,7 +85,7 @@ const onSubmit = handleSubmit(async (values) => {
 })
 watchEffect(() => {
   if (!store.isDataSourceFormOpen) {
-    console.log('limpiar')
+
     store.currentDsForm = null
     resetForm()
   }
@@ -96,13 +96,13 @@ watchEffect(() => {
   // }
 })
 const handleReset = () => {
-  console.log('limpiar')
+
   resetForm({ values: { ...initVals } })
 }
 store.$onAction(({ name, after }) => {
   after(() => {
     if (name === 'openDataSourceForm') {
-      console.log('seteando', store.currentDsForm)
+
       setValues({ ...store.currentDsForm })
       //resetForm({ values:  })
       store.currentDsForm = null

src/renderer/src/components/Backup.vue

@@ -66,7 +66,7 @@ const {handleSubmit, values} = useForm({
 })
 
 const onSubmit = handleSubmit((values) => {
-  console.log(values, 'asdfsdfsf')
+
   isOpenDialog.value = true
   const formValues = {...values, backupPath: ''}
   window.electron.backupDb(formValues)