From 9c594a8a96d0594ce8fd73f8f580847e22918c1a Mon Sep 17 00:00:00 2001 From: Dariusz Niemczyk Date: Fri, 15 Oct 2021 16:26:54 +0200 Subject: [PATCH] Replace console.logs to logger.log Related https://github.com/vector-im/element-web/issues/18425 --- src/utils/exportUtils/Exporter.ts | 10 ++++++---- src/utils/exportUtils/HtmlExport.tsx | 8 +++++--- src/utils/exportUtils/JSONExport.ts | 8 +++++--- src/utils/exportUtils/PlainTextExport.ts | 8 +++++--- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/src/utils/exportUtils/Exporter.ts b/src/utils/exportUtils/Exporter.ts index db28508c68..b23c1153e0 100644 --- a/src/utils/exportUtils/Exporter.ts +++ b/src/utils/exportUtils/Exporter.ts @@ -29,6 +29,8 @@ import { saveAs } from "file-saver"; import { _t } from "../../languageHandler"; import SdkConfig from "../../SdkConfig"; +import { logger } from "matrix-js-sdk/src/logger"; + type BlobFile = { name: string; blob: Blob; @@ -61,7 +63,7 @@ export default abstract class Exporter { } protected updateProgress(progress: string, log = true, show = true): void { - if (log) console.log(progress); + if (log) logger.log(progress); if (show) this.setProgressText(progress); } @@ -91,13 +93,13 @@ export default abstract class Exporter { } protected cleanUp(): string { - console.log("Cleaning up..."); + logger.log("Cleaning up..."); window.removeEventListener("beforeunload", this.onBeforeUnload); return ""; } public async cancelExport(): Promise { - console.log("Cancelling export..."); + logger.log("Cancelling export..."); this.cancelled = true; } @@ -212,7 +214,7 @@ export default abstract class Exporter { blob = await image.blob(); } } catch (err) { - console.log("Error decrypting media"); + logger.log("Error decrypting media"); } return blob; } diff --git a/src/utils/exportUtils/HtmlExport.tsx b/src/utils/exportUtils/HtmlExport.tsx index 5f8413fad8..cd440537df 100644 --- a/src/utils/exportUtils/HtmlExport.tsx +++ b/src/utils/exportUtils/HtmlExport.tsx @@ -38,6 +38,8 @@ import MatrixClientContext from "../../contexts/MatrixClientContext"; import getExportCSS from "./exportCSS"; import { textForEvent } from "../../TextForEvent"; +import { logger } from "matrix-js-sdk/src/logger"; + export default class HTMLExporter extends Exporter { protected avatars: Map; protected permalinkCreator: RoomPermalinkCreator; @@ -70,7 +72,7 @@ export default class HTMLExporter extends Exporter { this.totalSize += blob.size; this.addFile(avatarPath, blob); } catch (err) { - console.log("Failed to fetch room's avatar" + err); + logger.log("Failed to fetch room's avatar" + err); } } const avatar = ( @@ -238,7 +240,7 @@ export default class HTMLExporter extends Exporter { const blob = await image.blob(); this.addFile(`users/${member.userId.replace(/:/g, '-')}.png`, blob); } catch (err) { - console.log("Failed to fetch user's avatar" + err); + logger.log("Failed to fetch user's avatar" + err); } } } @@ -362,7 +364,7 @@ export default class HTMLExporter extends Exporter { this.addFile(filePath, blob); } } catch (e) { - console.log("Error while fetching file" + e); + logger.log("Error while fetching file" + e); eventTile = await this.getEventTileMarkup( this.createModifiedEvent(_t("Error fetching file"), mxEv), joined, diff --git a/src/utils/exportUtils/JSONExport.ts b/src/utils/exportUtils/JSONExport.ts index 4d862e69e3..41d9142a45 100644 --- a/src/utils/exportUtils/JSONExport.ts +++ b/src/utils/exportUtils/JSONExport.ts @@ -23,6 +23,8 @@ import { ExportType } from "./exportUtils"; import { IExportOptions } from "./exportUtils"; import { EventType } from "matrix-js-sdk/src/@types/event"; +import { logger } from "matrix-js-sdk/src/logger"; + export default class JSONExporter extends Exporter { protected totalSize = 0; protected messages: Record[] = []; @@ -67,7 +69,7 @@ export default class JSONExporter extends Exporter { this.addFile(filePath, blob); } } catch (err) { - console.log("Error fetching file: " + err); + logger.log("Error fetching file: " + err); } } const jsonEvent: any = mxEv.toJSON(); @@ -94,7 +96,7 @@ export default class JSONExporter extends Exporter { const res = await this.getRequiredEvents(); const fetchEnd = performance.now(); - console.log(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`); + logger.log(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`); console.info("Creating output..."); const text = await this.createOutput(res); @@ -113,7 +115,7 @@ export default class JSONExporter extends Exporter { console.info("Export cancelled successfully"); } else { console.info("Export successful!"); - console.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); + logger.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); } this.cleanUp(); diff --git a/src/utils/exportUtils/PlainTextExport.ts b/src/utils/exportUtils/PlainTextExport.ts index 8e3ba81c4e..fc122bca6e 100644 --- a/src/utils/exportUtils/PlainTextExport.ts +++ b/src/utils/exportUtils/PlainTextExport.ts @@ -24,6 +24,8 @@ import { ExportType } from "./exportUtils"; import { IExportOptions } from "./exportUtils"; import { textForEvent } from "../../TextForEvent"; +import { logger } from "matrix-js-sdk/src/logger"; + export default class PlainTextExporter extends Exporter { protected totalSize: number; protected mediaOmitText: string; @@ -94,7 +96,7 @@ export default class PlainTextExporter extends Exporter { } } catch (error) { mediaText = " (" + _t("Error fetching file") + ")"; - console.log("Error fetching file " + error); + logger.log("Error fetching file " + error); } } else mediaText = ` (${this.mediaOmitText})`; } @@ -123,7 +125,7 @@ export default class PlainTextExporter extends Exporter { const res = await this.getRequiredEvents(); const fetchEnd = performance.now(); - console.log(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`); + logger.log(`Fetched ${res.length} events in ${(fetchEnd - fetchStart)/1000}s`); this.updateProgress("Creating output..."); const text = await this.createOutput(res); @@ -142,7 +144,7 @@ export default class PlainTextExporter extends Exporter { console.info("Export cancelled successfully"); } else { console.info("Export successful!"); - console.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); + logger.log(`Exported ${res.length} events in ${(exportEnd - fetchStart)/1000} seconds`); } this.cleanUp();