Skip to content
This repository has been archived by the owner on Mar 7, 2021. It is now read-only.

Commit

Permalink
show progress bar steps
Browse files Browse the repository at this point in the history
  • Loading branch information
Arielgordon123 committed Jan 13, 2020
1 parent 0826147 commit ae9179a
Show file tree
Hide file tree
Showing 4 changed files with 17 additions and 7 deletions.
7 changes: 5 additions & 2 deletions src/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ protocol.registerSchemesAsPrivileged([
{ scheme: 'app', privileges: { secure: true, standard: true } },
]);

function onProgress({ percent }, step) {
mainWindow.webContents.send('onProgress-message', percent, step)
}

ipcMain.on('getScrapers', (event) => {
event.reply('getScrapers-reply', SCRAPERS);
Expand All @@ -35,8 +38,8 @@ ipcMain.on('decryptProperty', (event, importer, fields) => {
})
});

ipcMain.on('scrape', (event, installPath, scraperName, loginFields, showBrowser, logger, onProgress) => {
scrape(installPath, scraperName, loginFields, showBrowser, logger, onProgress).then((result) => {
ipcMain.on('scrape', (event, installPath, scraperName, loginFields, showBrowser, logger) => {
scrape(installPath, scraperName, loginFields, showBrowser, onProgress).then((result) => {
event.reply('scrape-reply', result)
})
});
Expand Down
6 changes: 5 additions & 1 deletion src/components/MainPage/Importers/Importer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ export default {
ipcRenderer.on('decryptProperty-reply', (event, decrypted) => {
this.decryptedImporter = decrypted;
});
ipcRenderer.on('onProgress-message', (event, percent, step) => {
this.onProgress(percent, step);
});
// decryptProperty(this.importer, "loginFields").then(decrypted => {
// this.decryptedImporter = decrypted;
// });
Expand Down Expand Up @@ -112,7 +116,7 @@ export default {
}
},
onProgress({ percent }, step) {
onProgress(percent, step) {
this.percentage = Math.floor(percent * 100);
if (step) {
this.step = step;
Expand Down
3 changes: 2 additions & 1 deletion src/service/downloadChromium.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ import { getPuppeteerConfig } from 'israeli-bank-scrapers-core';
const revision = getPuppeteerConfig().chromiumRevision;

export default async function (installPath, onProgress) {
// onProgress({ percent: 0 }, 'Step 1: Downloading Chrome...');
onProgress({ percent: 0 }, 'Step 1: Downloading Chrome...');
return download({
revision,
installPath,
onProgress
});
}
8 changes: 5 additions & 3 deletions src/service/scrapers.service.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ async function scrape(
scraperName,
loginFields,
showBrowser,
onProgress,
) {
// onProgress({ percent: 0.1 }, 'Step 1: check if Chrome exists');
const chromePath = await getChrome(installPath);
console.log('onProgress :', onProgress);
onProgress({ percent: 0.1 }, 'Step 1: check if Chrome exists');
const chromePath = await getChrome(installPath, onProgress);
const options = {
companyId: scraperName, // mandatory; one of 'hapoalim', 'leumi', 'discount', 'otsarHahayal', 'visaCal', 'leumiCard', 'isracard', 'amex'
// startDate: Date, // the date to fetch transactions from (can't be before the minimum allowed time difference for the scraper)
Expand All @@ -20,7 +22,7 @@ async function scrape(
executablePath: chromePath, // string // optional. provide a patch to local chromium to be used by puppeteer. Relevant when using `israeli-bank-scrapers-core` library
};
// if (logger) logger.info(JSON.stringify(options));
// onProgress({ percent: 0.5 }, `Step 2: Starting to scrape ${scraperName}`);
onProgress({ percent: 0.5 }, `Step 2: Starting to scrape ${scraperName}`);
const scraper = createScraper(options);
return scraper.scrape(loginFields);
}
Expand Down

0 comments on commit ae9179a

Please sign in to comment.