From d66e2e4e68f4ad7ed4f62418597e9fd01c7cfa62 Mon Sep 17 00:00:00 2001 From: Dominic Cicilio Date: Tue, 2 Jan 2024 03:47:59 -0500 Subject: [PATCH 1/3] temp --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..9c595a6 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +temp From 67dfe8a3799384f3d411bc0ae7282b4fa8b66945 Mon Sep 17 00:00:00 2001 From: Dominic Cicilio Date: Tue, 2 Jan 2024 04:54:44 -0500 Subject: [PATCH 2/3] fixes bugs --- .DS_Store | Bin 6148 -> 6148 bytes .gitignore | 1 + app/electron-builder.js | 2 +- app/launcher/dev_mode_launcher.py | 2 +- .../dist/dev_mode_launcher/dev_mode_launcher | Bin 1467984 -> 1467984 bytes app/src/main/dev_websockets.ts | 25 ++++++---- app/src/main/index.ts | 8 +++- app/src/shared/utils/httpFileServer.ts | 1 - extension/src/pages/content/index.ts | 44 +++++++++--------- 9 files changed, 47 insertions(+), 36 deletions(-) diff --git a/.DS_Store b/.DS_Store index 5008ddfcf53c02e82d7eee2e57c38e5672ef89f6..48b7fb38f14bcdbcdf510cfa5843e83b9d572900 100644 GIT binary patch delta 123 zcmZoMXfc=|&e%3FQEZ}~q9`K+0|O8XFfb%C6f>kU6qf}T>yQ}xjA?^7~3``erKM{FQO>Q1e8<&;shWDnSKC>88$nL>}Li5 D&7vB2 delta 67 zcmZoMXfc=|&Zs)EP;8=}A_oHyFfuR*Y}^>eKJh@*W_At%4o20D8^1G8<`+@q1WGX^ TfYeMj;Zfe4AhLvcVgm~RE=&+7 diff --git a/.gitignore b/.gitignore index cacb867..61aac8d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ **/dist **/app/launcher/dist/dev_mode_launcher/_internal releases +temp.txt # Compiled Scripts **/utils/reload/*.js diff --git a/app/electron-builder.js b/app/electron-builder.js index df52348..04ccc2e 100644 --- a/app/electron-builder.js +++ b/app/electron-builder.js @@ -25,7 +25,7 @@ module.exports = { }, dmg: { - icon: true, + icon: false, }, linux: { diff --git a/app/launcher/dev_mode_launcher.py b/app/launcher/dev_mode_launcher.py index 57e016e..b5d1719 100755 --- a/app/launcher/dev_mode_launcher.py +++ b/app/launcher/dev_mode_launcher.py @@ -148,7 +148,7 @@ def start_subprocess(ws): global proc current_directory = os.path.dirname(os.path.realpath(__file__)) project_root = find_project_root(current_directory, '.github') - electron_path = os.path.join(project_root, "node_modules/electron/dist/Electron.app/Contents/MacOS/Electron") + electron_path = os.path.join(project_root, "app/node_modules/electron/dist/Electron.app/Contents/MacOS/Electron") main_script_path = os.path.join(project_root, "app/node_modules/.dev/main/index.js") # Set environment variables for the subprocess diff --git a/app/launcher/dist/dev_mode_launcher/dev_mode_launcher b/app/launcher/dist/dev_mode_launcher/dev_mode_launcher index d15a7dbfbbb55b0f1b860dbf08ce68c48ba2f3af..c028138b4dd5d7b41e0a06f4cb6028faf96e927b 100755 GIT binary patch delta 3757 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 delta 3757 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 XEh)Y7;ewSqjOpM=qI|dK9~Nmw+FD{s diff --git a/app/src/main/dev_websockets.ts b/app/src/main/dev_websockets.ts index 54a9a61..c89363d 100644 --- a/app/src/main/dev_websockets.ts +++ b/app/src/main/dev_websockets.ts @@ -1,6 +1,6 @@ import WebSocket from 'ws' -const debugWebSocket = new WebSocket('ws://localhost:3333') +let debugWebSocket: WebSocket | null = null function generateRandomClientId() { const colors = ['red', 'blue', 'green', 'yellow', 'pink', 'black', 'white', 'purple', 'orange', 'brown'] @@ -9,10 +9,23 @@ function generateRandomClientId() { const animal = animals[Math.floor(Math.random() * animals.length)] return `${color} ${animal}` } - const clientId = generateRandomClientId() +export const initWebSocketServer = () => { + debugWebSocket = new WebSocket('ws://localhost:3333') + + debugWebSocket.on('open', function open() { + sendDebugMessage('info', 'Connected to debug server') + }) + + debugWebSocket.on('close', function close() { + sendDebugMessage('info', 'Disconnected from debug server') + }) +} + export function sendDebugMessage(type: string, data: string | Record | null) { + if (!debugWebSocket) return + const message = { type: type, client_id: clientId, @@ -29,11 +42,3 @@ export function sendDebugMessage(type: string, data: string | Record { await app.whenReady() + const isDev = process.argv.includes('--development') + try { const nativeMessagingHost = new NativeMessagingHost() + if (isDev) { + initWebSocketServer() + } const { server } = startHttpFileServer(app, port) nativeMessagingHost.addListener(message => { @@ -49,6 +54,5 @@ makeAppWithSingleInstanceLock(async () => { // @ts-ignore sendDebugMessage('error', e?.message || 'unknown') app.quit() - console.error('app error:', e) } }) diff --git a/app/src/shared/utils/httpFileServer.ts b/app/src/shared/utils/httpFileServer.ts index 0475887..0180da3 100644 --- a/app/src/shared/utils/httpFileServer.ts +++ b/app/src/shared/utils/httpFileServer.ts @@ -116,7 +116,6 @@ export const startHttpFileServer = (electronApp: Electron.App, port: number = 77 sendDebugMessage('debug - name', req.file.originalname) sendDebugMessage('debug - path', req.file.path) - sendDebugMessage('debug - upload input path', fs.readdirSync('uploads').join(', ')) // @ts-expect-error -- test token sendDebugMessage('debug - token', req?.token) sendDebugMessage('debug - file', req.file) diff --git a/extension/src/pages/content/index.ts b/extension/src/pages/content/index.ts index 99dea85..8060c07 100644 --- a/extension/src/pages/content/index.ts +++ b/extension/src/pages/content/index.ts @@ -256,6 +256,10 @@ const fileSizeToMB = fileSize => { // Iterate over the FileList for (let i = 0; i < files.length; i++) { const file = files.item(i) + + // Ignore files that are small + if (file.size < TRIGGER_SIZE) return + if (!file) { throw new Error('file not found') } @@ -269,28 +273,26 @@ const fileSizeToMB = fileSize => { e.stopPropagation() e.preventDefault() - if (file.size > TRIGGER_SIZE) { - displayLoadingWithSpinner(textAreaElement, `Compressing [${file.name}]`) - execCommand('compress_file', { - file, + displayLoadingWithSpinner(textAreaElement, `Compressing [${file.name}]`) + execCommand('compress_file', { + file, + }) + .then(({ file: compressedFile }) => { + console.log('compressedFile', compressedFile) + console.log('finish compressed video') + if (compressedFile) { + updateLoadingText( + textAreaElement, + `Compressing [${file.name}]`, + `Uploading [${compressedFile.name}]`, + ) + + uploadFile(textAreaElement, compressedFile, compressedFile.name) + } + }) + .catch(err => { + console.log('err', err) }) - .then(({ file: compressedFile }) => { - console.log('compressedFile', compressedFile) - console.log('finish compressed video') - if (compressedFile) { - updateLoadingText( - textAreaElement, - `Compressing [${file.name}]`, - `Uploading [${compressedFile.name}]`, - ) - - uploadFile(textAreaElement, compressedFile, compressedFile.name) - } - }) - .catch(err => { - console.log('err', err) - }) - } } } } From 865ba2bfbf1562c04ced69889f7ff0b5c4b6b174 Mon Sep 17 00:00:00 2001 From: Dominic Cicilio Date: Tue, 2 Jan 2024 04:54:52 -0500 Subject: [PATCH 3/3] updates readme --- README.md | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c595a6..d5abf09 100644 --- a/README.md +++ b/README.md @@ -1 +1,26 @@ -temp +# Github Video Compressor + +[![License](https://img.shields.io/badge/license-MIT-blue.svg)](LICENSE) + +## Description + +A inline video compressor for Github PR. +Never see the 100MB upload video file limit on Github PRs again. + +## Table of Contents + +- [Installation](#installation) +- [Contributing](#contributing) +- [License](#license) + +## App + Extension Installation + +TBD + +## Contributing + +TBD + +## License + +This project is licensed under the [MIT License](LICENSE).