Skip to content

Commit 389bb69

Browse files
authored
Merge pull request #1020 from bajrangCoder/logging-system
Implement Logger system
2 parents bf92547 + 37fea48 commit 389bb69

File tree

19 files changed

+191
-30
lines changed

19 files changed

+191
-30
lines changed

src/ace/colorView.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ function afterRender() {
141141
el.classList.add("ace_color");
142142
el.style.cssText = `background-color: ${content}; color: ${fontColorString}; pointer-events: all;`;
143143
} catch (error) {
144-
console.log("Invalid color", content);
144+
window.log("error", `Invalid color: ${content}`);
145+
window.log("error", error);
145146
}
146147
});
147148
}

src/ace/commands.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,13 @@ const commands = [
259259
editor._emit("select-word");
260260
},
261261
},
262+
{
263+
name: "openLogFile",
264+
description: "Open Log File",
265+
exec() {
266+
acode.exec("open-log-file");
267+
},
268+
},
262269
];
263270

264271
export function setCommands(editor) {
@@ -314,6 +321,7 @@ export async function resetKeyBindings() {
314321
}
315322
await fs.writeFile(content);
316323
} catch (error) {
317-
console.error(error);
324+
window.log("error", "Reset Keybinding failed!");
325+
window.log("error", error);
318326
}
319327
}

src/components/palette/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export default function palette(getList, onsSelectCb, placeholder, onremove) {
138138
}
139139

140140
remove = () => {
141-
console.error("Palette already removed");
141+
window.log("warn", "Palette already removed.");
142142
};
143143
}
144144
}

src/components/searchbar/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ function searchBar($list, setHide, onhideCb, searchFunction) {
7979
try {
8080
result = await result;
8181
} catch (error) {
82-
console.error("Search function failed:", error);
82+
window.log("error", "Search function failed:");
83+
window.log("error", error);
8384
result = [];
8485
}
8586
}

src/components/settingsPage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ function listItems($list, items, callback) {
304304
return;
305305
}
306306
} catch (error) {
307-
console.log(error);
307+
window.log("error", error);
308308
}
309309

310310
item.value = res;

src/lib/actionStack.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ export default {
3636
const copyStack = { ...this };
3737
delete copyStack.windowCopy;
3838
copyStack.pop = (repeat) => {
39-
console.error(
40-
"Deprecated: window.actionStack is deprecated, import actionStack instead",
39+
window.log(
40+
"error",
41+
"Deprecated: `window.actionStack` is deprecated, import `actionStack` instead",
4142
);
4243
this.pop(repeat);
4344
};

src/lib/commands.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import commandPalette from "palettes/commandPalette";
1414
import findFile from "palettes/findFile";
1515
import help from "settings/helpSettings";
1616
import mainSettings from "settings/mainSettings";
17+
import Url from "utils/Url";
1718
import { getColorRange } from "utils/color/regex";
1819
import helpers from "utils/helpers";
1920
import checkFiles from "./checkFiles";
@@ -362,4 +363,7 @@ export default {
362363
});
363364
editorManager.activeFile.eol = eol;
364365
},
366+
"open-log-file"() {
367+
openFile(Url.join(DATA_STORAGE, constants.LOG_FILE_NAME));
368+
},
365369
};

src/lib/constants.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,5 @@ export default {
2222
API_BASE: "https://acode.app/api",
2323
// API_BASE: 'https://192.168.0.102:3001/api', // test api
2424
SKU_LIST: ["basic", "bronze", "silver", "gold", "platinum"],
25+
LOG_FILE_NAME: "Acode.log",
2526
};

src/lib/editorFile.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,8 @@ export default class EditorFile {
477477

478478
await fs.writeFile(text);
479479
} catch (error) {
480-
console.error(error);
480+
window.log("error", "Writing to cache failed:");
481+
window.log("error", error);
481482
}
482483
}
483484

@@ -519,7 +520,7 @@ export default class EditorFile {
519520
if (oldText.length !== text.length) return true;
520521
return oldText !== text;
521522
} catch (error) {
522-
console.log(error);
523+
window.log("error", error);
523524
return false;
524525
}
525526
}
@@ -789,7 +790,8 @@ export default class EditorFile {
789790
if (!(await fs.exists())) return;
790791
fs.renameTo(newId);
791792
} catch (error) {
792-
console.error("renameCacheFile", error);
793+
window.log("error", "renameCacheFile");
794+
window.log("error", error);
793795
}
794796
}
795797

@@ -802,7 +804,7 @@ export default class EditorFile {
802804
if (!(await fs.exists())) return;
803805
await fs.delete();
804806
} catch (error) {
805-
console.error(error);
807+
window.log("error", error);
806808
}
807809
}
808810

@@ -838,6 +840,7 @@ export default class EditorFile {
838840
} else if (!cacheExists && fileExists) {
839841
value = await file.readFile(this.encoding);
840842
} else if (!cacheExists && !fileExists) {
843+
window.log("error", "unable to load file");
841844
throw new Error("Unable to load file");
842845
}
843846
}
@@ -870,7 +873,8 @@ export default class EditorFile {
870873
this.#emit("loaderror", createFileEvent(this));
871874
this.remove();
872875
toast(`Unable to load: ${this.filename}`);
873-
console.log(error);
876+
window.log("error", "Unable to load: " + this.filename);
877+
window.log("error", error);
874878
} finally {
875879
this.#emit("loadend", createFileEvent(this));
876880
}

src/lib/fileList.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ export async function addRoot({ url, name }) {
222222
emit("add-folder", tree);
223223
} catch (error) {
224224
// ignore
225-
console.error(error);
225+
window.log("error", error);
226226
}
227227
}
228228

0 commit comments

Comments
 (0)