Skip to content

Commit 3b97363

Browse files
committed
Cleanup logs.
Signed-off-by: ubi de feo <me@ubidefeo.com>
1 parent be08f3e commit 3b97363

3 files changed

Lines changed: 34 additions & 46 deletions

File tree

backend/serial/serial-bridge.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,10 @@ const SerialBridge = {
6767
if (dataConsumer) {
6868
ipcRenderer.removeAllListeners("serial-on-load-progress")
6969
ipcRenderer.on('serial-on-load-progress', (event, progress) => {
70-
console.log('[serial-bridge] serial-on-load-progress received:', progress)
7170
dataConsumer(progress)
7271
})
7372
}
7473
const result = await ipcRenderer.invoke('serial', 'loadFile', file)
75-
console.log('[serial-bridge] invoke resolved, removing listener')
7674
ipcRenderer.removeAllListeners("serial-on-load-progress")
7775
return result
7876
},
@@ -111,12 +109,10 @@ const SerialBridge = {
111109
if (dataConsumer) {
112110
ipcRenderer.removeAllListeners("serial-on-load-progress")
113111
ipcRenderer.on('serial-on-load-progress', (event, progress) => {
114-
console.log('[serial-bridge] serial-on-load-progress (download) received:', progress)
115112
dataConsumer(progress)
116113
})
117114
}
118115
let contents = await ipcRenderer.invoke('serial', 'loadFile', src)
119-
console.log('[serial-bridge] download invoke resolved, removing listener')
120116
ipcRenderer.removeAllListeners("serial-on-load-progress")
121117
return ipcRenderer.invoke('save-file', dest, contents)
122118
},

backend/serial/serial.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ class Serial {
122122

123123
async loadFile(file) {
124124
const output = await this.board.fs_cat_binary(file, (progress) => {
125-
console.log('[serial.js load-progress]', progress)
126125
this.win.webContents.send('serial-on-load-progress', progress)
127126
})
128127
return output || ''

ui/arduino/store.js

Lines changed: 34 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ async function store(state, emitter) {
185185

186186
// CONNECTION DIALOG
187187
emitter.on('open-connection-dialog', async () => {
188-
log('open-connection-dialog')
188+
// log('open-connection-dialog')
189189
dismissOpenDialogs()
190190
await serialBridge.disconnect()
191191
state.availablePorts = await getAvailablePorts()
@@ -203,7 +203,7 @@ async function store(state, emitter) {
203203
emitter.emit('render')
204204
})
205205
emitter.on('select-port', async (port) => {
206-
log('connect', port)
206+
// log('connect', port)
207207
const path = port.path
208208

209209
state.isConnecting = true
@@ -253,7 +253,6 @@ async function store(state, emitter) {
253253
// Bind terminal
254254
let term = state.cache(XTerm, 'terminal').term
255255
terminalRouter = new TerminalOutputRouter(term)
256-
window._termRouter = terminalRouter // DEBUG: check currentOperation in console
257256
terminalRouter.setOperation('suppress')
258257
terminalRouter.setHook('code-execution:before', (router) => {
259258
router.write('\r\n')
@@ -356,7 +355,7 @@ async function store(state, emitter) {
356355

357356

358357
emitter.on('run', async (onlySelected = false) => {
359-
log('run')
358+
// log('run')
360359
const openFile = state.openFiles.find(f => f.id == state.editingFile)
361360
let code = openFile.editor.editor.state.doc.toString()
362361

@@ -404,7 +403,7 @@ async function store(state, emitter) {
404403
emitter.emit('render')
405404
})
406405
emitter.on('stop', async () => {
407-
log('stop')
406+
// log('stop')
408407
if (state.panelHeight <= PANEL_CLOSED) {
409408
state.panelHeight = state.savedPanelHeight
410409
}
@@ -425,7 +424,7 @@ async function store(state, emitter) {
425424
}
426425
})
427426
emitter.on('reset', async () => {
428-
log('reset')
427+
// log('reset')
429428
if (state.panelHeight <= PANEL_CLOSED) {
430429
state.panelHeight = state.savedPanelHeight
431430
}
@@ -477,7 +476,7 @@ async function store(state, emitter) {
477476
state.cache(XTerm, 'terminal').term.clear()
478477
})
479478
emitter.on('start-resizing-panel', () => {
480-
log('start-resizing-panel')
479+
// log('start-resizing-panel')
481480
window.addEventListener('mousemove', state.resizePanel)
482481
// Stop resizing when mouse leaves window or enters the tabs area
483482
document.body.addEventListener('mouseleave', () => {
@@ -488,28 +487,28 @@ async function store(state, emitter) {
488487
}, { once: true })
489488
})
490489
emitter.on('stop-resizing-panel', () => {
491-
log('stop-resizing-panel')
490+
// log('stop-resizing-panel')
492491
resizeTerminal()
493492
window.removeEventListener('mousemove', state.resizePanel)
494493
})
495494

496495
// NEW FILE AND SAVING
497496
emitter.on('create-new-file', async () => {
498-
log('create-new-file')
497+
// log('create-new-file')
499498
dismissOpenDialogs()
500499
const result = await showInputOverlay(state, emitter, 'Create new file', generateFileName(), state.isConnected)
501500
if (result) emitter.emit('create-new-tab', result.device, result.fileName)
502501
})
503502
emitter.on('save', async () => {
504-
log('save')
503+
// log('save')
505504
let response = canSave({
506505
view: state.view,
507506
isConnected: state.isConnected,
508507
openFiles: state.openFiles,
509508
editingFile: state.editingFile
510509
})
511510
if (response == false) {
512-
log("can't save")
511+
// log("can't save")
513512
return
514513
}
515514

@@ -638,12 +637,12 @@ async function store(state, emitter) {
638637

639638
// TABS
640639
emitter.on('select-tab', (id) => {
641-
log('select-tab', id)
640+
// log('select-tab', id)
642641
state.editingFile = id
643642
emitter.emit('render')
644643
})
645644
emitter.on('close-tab', async (id) => {
646-
log('close-tab', id)
645+
// log('close-tab', id)
647646
const currentTab = state.openFiles.find(f => f.id === id)
648647
if (currentTab.hasChanges) {
649648
let response = await showConfirmOverlay(state, emitter, "Your file has unsaved changes.\nAre you sure you want to proceed?", "Cancel", "Yes")
@@ -663,7 +662,7 @@ async function store(state, emitter) {
663662

664663
// FILE OPERATIONS
665664
emitter.on('refresh-files', async () => {
666-
log('refresh-files')
665+
// log('refresh-files')
667666
if (state.isLoadingFiles) return
668667
state.isLoadingFiles = true
669668
emitter.emit('render')
@@ -713,7 +712,7 @@ async function store(state, emitter) {
713712
emitter.emit('render')
714713
})
715714
emitter.on('refresh-selected-files', () => {
716-
log('refresh-selected-files')
715+
// log('refresh-selected-files')
717716
state.selectedFiles = state.selectedFiles.filter(f => {
718717
if (f.source === 'board') {
719718
if (!state.isConnected) return false
@@ -726,14 +725,14 @@ async function store(state, emitter) {
726725
})
727726
emitter.on('create-new-tab', async (device, fileName = null) => {
728727
const parentFolder = device == 'board' ? state.boardNavigationPath : state.diskNavigationPath
729-
log('create-new-tab', device, fileName, parentFolder)
728+
// log('create-new-tab', device, fileName, parentFolder)
730729
const success = await createNewTab(device, fileName, parentFolder)
731730
if (success) {
732731
emitter.emit('render')
733732
}
734733
})
735734
emitter.on('create-file', (device, fileName = null) => {
736-
log('create-file', device)
735+
// log('create-file', device)
737736
if (state.creatingFile !== null) return
738737

739738
state.creatingFile = device
@@ -745,7 +744,7 @@ async function store(state, emitter) {
745744
})
746745

747746
emitter.on('finish-creating-file', async (fileNameParameter) => {
748-
log('finish-creating', fileNameParameter)
747+
// log('finish-creating', fileNameParameter)
749748
if (!state.creatingFile) return
750749

751750
if (!fileNameParameter) {
@@ -852,14 +851,14 @@ async function store(state, emitter) {
852851
}, 200)
853852
})
854853
emitter.on('create-folder', (device) => {
855-
log('create-folder', device)
854+
// log('create-folder', device)
856855
if (state.creatingFolder !== null) return
857856
state.creatingFolder = device
858857
state.creatingFile = null
859858
emitter.emit('render')
860859
})
861860
emitter.on('finish-creating-folder', async (value) => {
862-
log('finish-creating-folder', value)
861+
// log('finish-creating-folder', value)
863862
if (!state.creatingFolder) return
864863

865864
if (!value) {
@@ -941,7 +940,7 @@ async function store(state, emitter) {
941940
})
942941

943942
emitter.on('remove-files', async () => {
944-
log('remove-files') // and folders
943+
// log('remove-files') // and folders
945944
state.isRemoving = true
946945
emitter.emit('render')
947946

@@ -1024,12 +1023,12 @@ async function store(state, emitter) {
10241023
})
10251024

10261025
emitter.on('rename-file', (source, item) => {
1027-
log('rename-file', source, item)
1026+
// log('rename-file', source, item)
10281027
state.renamingFile = source
10291028
emitter.emit('render')
10301029
})
10311030
emitter.on('finish-renaming-file', async (value) => {
1032-
log('finish-renaming-file', value)
1031+
// log('finish-renaming-file', value)
10331032

10341033
// You can only rename one file, the selected one
10351034
const file = state.selectedFiles[0]
@@ -1169,12 +1168,12 @@ async function store(state, emitter) {
11691168
})
11701169

11711170
emitter.on('rename-tab', (id) => {
1172-
log('rename-tab', id)
1171+
// log('rename-tab', id)
11731172
state.renamingTab = id
11741173
emitter.emit('render')
11751174
})
11761175
emitter.on('finish-renaming-tab', async (value) => {
1177-
log('finish-renaming-tab', value)
1176+
// log('finish-renaming-tab', value)
11781177

11791178
// You can only rename one tab, the active one
11801179
const openFile = state.openFiles.find(f => f.id === state.renamingTab)
@@ -1386,7 +1385,7 @@ async function store(state, emitter) {
13861385
})
13871386

13881387
emitter.on('toggle-file-selection', (file, source, event) => {
1389-
log('toggle-file-selection', file, source, event)
1388+
// log('toggle-file-selection', file, source, event)
13901389
let parentFolder = source == 'board' ? state.boardNavigationPath : state.diskNavigationPath
13911390
// Single file selection unless holding keyboard key
13921391
if (event && !event.ctrlKey && !event.metaKey) {
@@ -1422,7 +1421,7 @@ async function store(state, emitter) {
14221421
emitter.emit('render')
14231422
})
14241423
emitter.on('open-selected-files', async () => {
1425-
log('open-selected-files')
1424+
// log('open-selected-files')
14261425
let filesToOpen = []
14271426
let filesAlreadyOpen = []
14281427
if (state.isLoadingFiles) return
@@ -1459,18 +1458,14 @@ async function store(state, emitter) {
14591458
selectedFile.fileName
14601459
),
14611460
(progress) => {
1462-
console.log('[load-progress]', progress)
14631461
state.overlay = { type: 'progress', props: { message: `Opening ${selectedFile.fileName}…`, pct: parseInt(progress) || 0 } }
14641462
emitter.emit('render')
14651463
}
14661464
)
1467-
console.log('[open-file] fileContent type:', typeof fileContent, '| constructor:', fileContent?.constructor?.name, '| byteLength:', fileContent?.byteLength, '| length:', fileContent?.length)
14681465
// we convert the buffer to a Uint8Array
14691466
const contentArray = new Uint8Array(fileContent);
1470-
console.log('[open-file] contentArray length:', contentArray.length)
14711467
// we feed the Uint8Array to the TextDecoder
14721468
const bytesToSource = new TextDecoder('utf-8').decode(contentArray);
1473-
console.log('[open-file] decoded length:', bytesToSource.length, '| first 80 chars:', JSON.stringify(bytesToSource.slice(0, 80)))
14741469
file = createFile({
14751470
parentFolder: state.boardNavigationPath,
14761471
fileName: selectedFile.fileName,
@@ -1523,15 +1518,14 @@ async function store(state, emitter) {
15231518
state.view = 'editor'
15241519
updateMenu()
15251520
} finally {
1526-
console.log('[open-selected-files] finally: clearing overlay, isLoadingFiles')
15271521
state.overlay = null
15281522
state.isLoadingFiles = false
15291523
if (terminalRouter && state.isConnected) terminalRouter.setOperation('repl-interactive')
15301524
emitter.emit('render')
15311525
}
15321526
})
15331527
emitter.on('open-file', (source, file) => {
1534-
log('open-file', source, file)
1528+
// log('open-file', source, file)
15351529
state.selectedFiles = [{
15361530
fileName: file.fileName,
15371531
type: file.type,
@@ -1565,7 +1559,7 @@ async function store(state, emitter) {
15651559

15661560
// DOWNLOAD AND UPLOAD FILES
15671561
emitter.on('upload-files', async () => {
1568-
log('upload-files')
1562+
// log('upload-files')
15691563
state.isTransferring = true
15701564
emitter.emit('render')
15711565
try {
@@ -1670,7 +1664,7 @@ async function store(state, emitter) {
16701664
}
16711665
})
16721666
emitter.on('download-files', async () => {
1673-
log('download-files')
1667+
// log('download-files')
16741668
state.isTransferring = true
16751669
emitter.emit('render')
16761670

@@ -1721,7 +1715,6 @@ async function store(state, emitter) {
17211715
await serialBridge.downloadFile(
17221716
srcPath, destPath,
17231717
(e) => {
1724-
console.log('[download-progress]', e)
17251718
state.transferringProgress = e
17261719
emitter.emit('render')
17271720
}
@@ -1742,7 +1735,7 @@ async function store(state, emitter) {
17421735

17431736
// NAVIGATION
17441737
emitter.on('navigate-board-folder', (folder) => {
1745-
log('navigate-board-folder', folder)
1738+
// log('navigate-board-folder', folder)
17461739
if (terminalRouter) terminalRouter.setOperation('directory-navigation')
17471740
state.boardNavigationPath = serialBridge.getNavigationPath(
17481741
state.boardNavigationPath,
@@ -1752,7 +1745,7 @@ async function store(state, emitter) {
17521745
emitter.emit('render')
17531746
})
17541747
emitter.on('navigate-board-parent', () => {
1755-
log('navigate-board-parent')
1748+
// log('navigate-board-parent')
17561749
state.boardNavigationPath = serialBridge.getNavigationPath(
17571750
state.boardNavigationPath,
17581751
'..'
@@ -1762,7 +1755,7 @@ async function store(state, emitter) {
17621755
})
17631756

17641757
emitter.on('navigate-disk-folder', (folder) => {
1765-
log('navigate-disk-folder', folder)
1758+
// log('navigate-disk-folder', folder)
17661759
state.diskNavigationPath = disk.getNavigationPath(
17671760
state.diskNavigationPath,
17681761
folder
@@ -1771,7 +1764,7 @@ async function store(state, emitter) {
17711764
emitter.emit('render')
17721765
})
17731766
emitter.on('navigate-disk-parent', () => {
1774-
log('navigate-disk-parent')
1767+
// log('navigate-disk-parent')
17751768
state.diskNavigationPath = disk.getNavigationPath(
17761769
state.diskNavigationPath,
17771770
'..'
@@ -2006,7 +1999,7 @@ function saveDiskNavigationRootToStorage(path) {
20061999
localStorage.setItem('diskNavigationRoot', path)
20072000
return true
20082001
} catch(e) {
2009-
log('saveDiskNavigationRootToStorage', e)
2002+
// log('saveDiskNavigationRootToStorage', e)
20102003
return false
20112004
}
20122005
}

0 commit comments

Comments
 (0)