Compare commits

...

36 commits
1.8.4 ... main

Author SHA1 Message Date
c8538f5d03
fix packager 2024-09-10 17:44:55 +02:00
2c2f469cc5
update dependencies 2024-09-10 17:40:26 +02:00
7973a02603
Merge pull request 'fix: close ffmpeg by send the quit command in stdin' (#23) from force-close-ffmpeg into main
Reviewed-on: #23
2024-09-10 17:31:58 +02:00
a6fe54fd9c
close ffmpeg by send the quit command in stdin 2024-09-10 17:30:52 +02:00
20052ed7d6
update readme 2024-09-06 10:08:05 +02:00
877021ee0d
typos 2024-09-06 10:02:01 +02:00
fce9bce308
add nitro basic 2024-09-06 10:01:02 +02:00
0ed6407315
bump version to 1.9.3
All checks were successful
Upload release / build (push) Successful in 1m39s
2024-09-02 14:27:55 +02:00
af921925af
asar packaging (#21) 2024-09-02 14:27:37 +02:00
cb9de1b856
make the release a draft 2024-09-02 13:24:00 +02:00
1d1c0f78bc
bump version to 1.9.2
All checks were successful
Upload release / build (push) Successful in 1m29s
2024-09-02 13:18:40 +02:00
6fffd19278
add more room for audio bitrate 2024-09-02 13:15:36 +02:00
bfa1f94a43
bump version to 1.9.1
All checks were successful
Upload release / build (push) Successful in 1m51s
2024-09-01 02:28:05 +02:00
ebbca9b6aa
update some dependencies 2024-09-01 02:27:55 +02:00
fc7782a982
Fix Windows notification title 2024-09-01 02:25:14 +02:00
440fcf2334
Share -> Broadcast 2024-09-01 02:14:59 +02:00
d93b0d148b
bump version to 1.9.0
All checks were successful
Upload release / build (push) Successful in 1m23s
2024-08-22 17:47:57 +02:00
0399080d6e
if no compression is needed, optimize for streaming 2024-08-22 17:47:21 +02:00
d4bb073218
update dependencies 2024-08-22 17:39:53 +02:00
b35635daf0
bump version to 1.8.9
All checks were successful
Upload release / build (push) Successful in 1m34s
2024-08-21 19:41:54 +02:00
cdf2e678c3
do a simple copy instead of relying on ffmpeg + add 1 for the video stream when doing the compression 2024-08-21 19:40:16 +02:00
2fe6f6aece
correctly copy all the streams 2024-08-21 19:31:26 +02:00
d9c21876e8
Silently continue when DSR is already closed 2024-08-20 21:00:37 +02:00
0047664616
add badge 2024-08-20 20:59:04 +02:00
d6880ab85c
bump version to 1.8.8
All checks were successful
Upload release / build (push) Successful in 1m10s
2024-08-20 20:53:42 +02:00
0b85415c1d
add automatic build (#7) 2024-08-20 20:52:52 +02:00
04b4138b46
directly get info about number of audio tracks, cleaning up the horrible code in the audio merger and don't try to merge audio streams when there is 2+ 2024-08-20 20:14:38 +02:00
8fb8f24625
force close dsr before updating (#18) 2024-07-11 14:33:56 +02:00
80dca39b8c
bump version to 1.8.7 2024-07-11 13:55:37 +02:00
de983c8802
fix crash when no audio stream 2024-07-11 13:55:29 +02:00
a202996c11
audit fix 2024-07-11 13:55:06 +02:00
65339d4592
bump version to 1.8.6 2024-05-17 22:04:17 +02:00
e0076c7705
fix nvenc reducing more the video bitrate 2024-05-17 22:03:48 +02:00
ede370763f
bump version to 1.8.5 2024-05-17 21:58:25 +02:00
4890ee40a2
fix nvenc 2024-05-17 21:57:52 +02:00
f93673ce68
bump version to 1.8.4 2024-05-17 21:51:09 +02:00
9 changed files with 252 additions and 253 deletions

View file

@ -0,0 +1,28 @@
name: Upload release
on:
push:
tags:
- "*"
jobs:
build:
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Install dependencies
run: |
npm install --platform=win32 &&
apt-get update &&
apt-get install -y zip
- name: Build the app
run: npm run make -- --platform=win32
- name: Create release
uses: akkuman/gitea-release-action@v1
with:
token: ${{ secrets.TOKEN }}
files: out/make/zip/win32/x64/dsr-win32-x64-${{ github.ref_name }}.zip
draft: true

View file

@ -1,10 +1,10 @@
# Discord Video Sharing
# Discord Video Sharing ![status-badge](https://git.mylloon.fr/Anri/dsr/badges/workflows/release.yml/badge.svg)
Tool for sharing video to Discord.
> This tool was primarily made for video captured by NVidia Shadowplay.
## Download/Install
## Download/Install/Update
2 choices :
@ -16,21 +16,23 @@ Tool for sharing video to Discord.
```
> - If you have Discord Nitro: add `/nitro` flag when running DSR.
> - If you have Discord Nitro Basic: add `/nitrobasic` flag when running DSR.
> - If you have an NVidia GPU with NVenc: add `/nvenc` flag when running DSR.
## More info
- [x] KISS interface
- [x] Support drag&drop into the icon
- [x] Keep the video under 25mb (discord limitation)
- [x] NVenc support
- [x] Keep the video under discord limitation
- [x] If already under the limit, the file won't be compressed
- [x] Nitro suppport via `/nitro` flag
- [x] Merge audio files into one track when recorded with system audio and microphone
split up, while keeping the original ones (with conveninant metadata)
- [x] Works also with file with only one audio track
- [x] Basic NVenc support
- [x] Nitro suppport via flags
- [x] Merge 2 audio files into one track when recorded with system audio and microphone
split up, while keeping the original ones (with conveniant metadata)
- [x] Works also with file with only one or more than 2 audio track, by doing
nothing
- [x] Support multiples files at once
- [x] Optimize for video streaming
- [x] Always optimize for video streaming
## Package the app for Windows

View file

@ -15,6 +15,9 @@ $archive = "$env:TEMP\dsr.zip"
Invoke-WebRequest -Uri $link -OutFile $archive
Remove-Item "$path" -Recurse -ErrorAction SilentlyContinue
# Close running DSR
Stop-Process -Name "DSR" -Force -ErrorAction SilentlyContinue
# Installation
Expand-Archive -Path $archive -DestinationPath "$path" -Force
Move-Item -Path "$path\dsr-win32-x64\*" -Destination "$path" -Force

298
package-lock.json generated
View file

@ -1,24 +1,23 @@
{
"name": "dsr",
"version": "1.8.3",
"version": "1.9.3",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "dsr",
"version": "1.8.3",
"version": "1.9.3",
"license": "AGPL-3.0-or-later",
"dependencies": {
"@electron-forge/maker-zip": "^7.4",
"ffmpeg-static": "^5.2",
"ffprobe-static": "^3.1",
"terminate": "^2.6.1",
"typescript": "^5.4"
"typescript": "^5.6"
},
"devDependencies": {
"@electron-forge/cli": "^7.4",
"@types/ffprobe-static": "^2.0",
"electron": "^30.0"
"electron": "^32.0"
}
},
"node_modules/@derhuerst/http-basic": {
@ -312,11 +311,12 @@
}
},
"node_modules/@electron/asar": {
"version": "3.2.10",
"resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.10.tgz",
"integrity": "sha512-mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw==",
"version": "3.2.11",
"resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.2.11.tgz",
"integrity": "sha512-L373+owaTGjko13wS/KlbxC4cyqwTmWg740nb3pwQSmV0kcoS1oP/JE5WfyRkNbhw3GFzJXk0y3pBawgXNc5oA==",
"license": "MIT",
"dependencies": {
"@types/glob": "^7.1.0",
"commander": "^5.0.0",
"glob": "^7.1.6",
"minimatch": "^3.0.4"
@ -338,9 +338,9 @@
}
},
"node_modules/@electron/get": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@electron/get/-/get-3.0.0.tgz",
"integrity": "sha512-hLv4BYFiyrNRI+U0Mm2X7RxCCdJLkDUn8GCEp9QJzbLpZRko+UaLlCjOMkj6TEtirNLPyBA7y1SeGfnpOB21aQ==",
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/@electron/get/-/get-3.1.0.tgz",
"integrity": "sha512-F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==",
"license": "MIT",
"dependencies": {
"debug": "^4.1.1",
@ -400,9 +400,9 @@
}
},
"node_modules/@electron/notarize": {
"version": "2.3.2",
"resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.3.2.tgz",
"integrity": "sha512-zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg==",
"version": "2.4.0",
"resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.4.0.tgz",
"integrity": "sha512-ArHnRPIJJGrmV+uWNQSINAht+cM4gAo3uA3WFI54bYF93mzmD15gzhPQ0Dd+v/fkMhnRiiIO8NNkGdn87Vsy0g==",
"license": "MIT",
"dependencies": {
"debug": "^4.1.1",
@ -429,9 +429,9 @@
}
},
"node_modules/@electron/osx-sign": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.0.tgz",
"integrity": "sha512-TEXhxlYSDRr9JWK5nWdOv5MtuUdaZ412uxIIEQ0hLt80o0HYWtQJBlW5QmrQDMtebzATaOjKG9UfCzLyA90zWQ==",
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.1.tgz",
"integrity": "sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw==",
"license": "BSD-2-Clause",
"dependencies": {
"compare-version": "^0.1.2",
@ -450,9 +450,9 @@
}
},
"node_modules/@electron/packager": {
"version": "18.3.2",
"resolved": "https://registry.npmjs.org/@electron/packager/-/packager-18.3.2.tgz",
"integrity": "sha512-orjylavppgIh24qkNpWm2B/LQUpCS/YLOoKoU+eMK/hJgIhShLDsusPIQzgUGVwNCichu8/zPAGfdQZXHG0gtw==",
"version": "18.3.4",
"resolved": "https://registry.npmjs.org/@electron/packager/-/packager-18.3.4.tgz",
"integrity": "sha512-u/IxB5nelg+areXbSEWJxg1r4z0TcS1D1Dax106PsgwgPtcFvB6jjGxZVLA0WHSrLpkj6qfigHSuVXzxMTH+Qw==",
"license": "BSD-2-Clause",
"dependencies": {
"@electron/asar": "^3.2.1",
@ -569,9 +569,9 @@
}
},
"node_modules/@electron/universal/node_modules/minimatch": {
"version": "9.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz",
"integrity": "sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==",
"version": "9.0.5",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
"integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
"license": "ISC",
"dependencies": {
"brace-expansion": "^2.0.1"
@ -584,9 +584,9 @@
}
},
"node_modules/@electron/windows-sign": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.1.2.tgz",
"integrity": "sha512-eXEiZjDtxW3QORCWfRUarANPRTlH9B6At4jqBZJ0NzokSGutXQUVLPA6WmGpIhDW6w2yCMdHW1EJd1HrXtU5sg==",
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.1.3.tgz",
"integrity": "sha512-OqVSdAe+/88fIjvTDWiy+5Ho1nXsiBhE5RTsIQ6M/zcxcDAEP2TlQCkOyusItnmzXRN+XTFaK9gKhiZ6KGyXQw==",
"license": "BSD-2-Clause",
"dependencies": {
"cross-dirname": "^0.1.0",
@ -761,6 +761,16 @@
"dev": true,
"license": "MIT"
},
"node_modules/@types/glob": {
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
"integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
"license": "MIT",
"dependencies": {
"@types/minimatch": "*",
"@types/node": "*"
}
},
"node_modules/@types/http-cache-semantics": {
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.4.tgz",
@ -776,13 +786,19 @@
"@types/node": "*"
}
},
"node_modules/@types/minimatch": {
"version": "5.1.2",
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
"integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==",
"license": "MIT"
},
"node_modules/@types/node": {
"version": "20.12.12",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.12.tgz",
"integrity": "sha512-eWLDGF/FOSPtAvEqeRAQ4C8LSA7M1I7i0ky1I8U7kD1J5ITyW3AsRhQrKVoWf5pFKZ2kILsEGJhsI9r93PYnOw==",
"version": "22.5.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.4.tgz",
"integrity": "sha512-FDuKUJQm/ju9fT/SeX/6+gBzoPzlVCzfzmGkwKvRHQVxi4BntVbyIwf6a4Xn62mrvndLiml6z/UBXIdEVjQLXg==",
"license": "MIT",
"dependencies": {
"undici-types": "~5.26.4"
"undici-types": "~6.19.2"
}
},
"node_modules/@types/responselike": {
@ -872,9 +888,9 @@
}
},
"node_modules/ansi-regex": {
"version": "6.0.1",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
"integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
"integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
"license": "MIT",
"engines": {
"node": ">=12"
@ -908,6 +924,7 @@
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
"integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
"deprecated": "This package is no longer supported.",
"license": "ISC",
"dependencies": {
"delegates": "^1.0.0",
@ -996,13 +1013,13 @@
}
},
"node_modules/braces": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
"version": "3.0.3",
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
"integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
"dev": true,
"license": "MIT",
"dependencies": {
"fill-range": "^7.0.1"
"fill-range": "^7.1.1"
},
"engines": {
"node": ">=8"
@ -1089,6 +1106,7 @@
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
"integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
"deprecated": "Glob versions prior to v9 are no longer supported",
"license": "ISC",
"dependencies": {
"fs.realpath": "^1.0.0",
@ -1175,9 +1193,9 @@
}
},
"node_modules/chrome-trace-event": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz",
"integrity": "sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==",
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
"integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
"license": "MIT",
"engines": {
"node": ">=6.0"
@ -1460,12 +1478,12 @@
}
},
"node_modules/debug": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
"integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
"version": "4.3.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
"integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
"license": "MIT",
"dependencies": {
"ms": "2.1.2"
"ms": "^2.1.3"
},
"engines": {
"node": ">=6.0"
@ -1592,12 +1610,6 @@
"p-limit": "^3.1.0 "
}
},
"node_modules/duplexer": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
"integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
"license": "MIT"
},
"node_modules/eastasianwidth": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
@ -1605,9 +1617,9 @@
"license": "MIT"
},
"node_modules/electron": {
"version": "30.0.6",
"resolved": "https://registry.npmjs.org/electron/-/electron-30.0.6.tgz",
"integrity": "sha512-PkhEPFdpYcTzjAO3gMHZ+map7g2+xCrMDedo/L1i0ir2BRXvAB93IkTJX497U6Srb/09r2cFt+k20VPNVCdw3Q==",
"version": "32.0.2",
"resolved": "https://registry.npmjs.org/electron/-/electron-32.0.2.tgz",
"integrity": "sha512-nmZblq8wW3HZ17MAyaUuiMI9Mb0Cgc7UR3To85h/rVopbfyF5s34NxtK4gvyRfYPxpDGP4k+HoQIPniPPrdE3w==",
"dev": true,
"hasInstallScript": true,
"license": "MIT",
@ -1645,6 +1657,16 @@
"global-agent": "^3.0.0"
}
},
"node_modules/electron/node_modules/@types/node": {
"version": "20.16.5",
"resolved": "https://registry.npmjs.org/@types/node/-/node-20.16.5.tgz",
"integrity": "sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==",
"dev": true,
"license": "MIT",
"dependencies": {
"undici-types": "~6.19.2"
}
},
"node_modules/electron/node_modules/fs-extra": {
"version": "8.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@ -1770,9 +1792,9 @@
"optional": true
},
"node_modules/escalade": {
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz",
"integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==",
"version": "3.2.0",
"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
"integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
"license": "MIT",
"engines": {
"node": ">=6"
@ -1791,21 +1813,6 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
"node_modules/event-stream": {
"version": "3.3.4",
"resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
"integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
"license": "MIT",
"dependencies": {
"duplexer": "~0.1.1",
"from": "~0",
"map-stream": "~0.1.0",
"pause-stream": "0.0.11",
"split": "0.3",
"stream-combiner": "~0.0.4",
"through": "~2.3.1"
}
},
"node_modules/eventemitter3": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.1.tgz",
@ -2041,9 +2048,9 @@
}
},
"node_modules/fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
"version": "7.1.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
"integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
"dev": true,
"license": "MIT",
"dependencies": {
@ -2083,12 +2090,6 @@
"node": ">= 12"
}
},
"node_modules/from": {
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
"integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
"license": "MIT"
},
"node_modules/fs-extra": {
"version": "10.1.0",
"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@ -2148,6 +2149,7 @@
"version": "4.0.4",
"resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
"integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
"deprecated": "This package is no longer supported.",
"license": "ISC",
"dependencies": {
"aproba": "^1.0.3 || ^2.0.0",
@ -2301,6 +2303,7 @@
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
"deprecated": "Glob versions prior to v9 are no longer supported",
"license": "ISC",
"dependencies": {
"fs.realpath": "^1.0.0",
@ -2670,6 +2673,7 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
"deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
"license": "ISC",
"dependencies": {
"once": "^1.3.0",
@ -2719,12 +2723,15 @@
"license": "MIT"
},
"node_modules/is-core-module": {
"version": "2.13.1",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz",
"integrity": "sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==",
"version": "2.15.1",
"resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
"integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
"license": "MIT",
"dependencies": {
"hasown": "^2.0.0"
"hasown": "^2.0.2"
},
"engines": {
"node": ">= 0.4"
},
"funding": {
"url": "https://github.com/sponsors/ljharb"
@ -3043,11 +3050,6 @@
"node": ">=6"
}
},
"node_modules/map-stream": {
"version": "0.1.0",
"resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
"integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="
},
"node_modules/matcher": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
@ -3087,13 +3089,13 @@
}
},
"node_modules/micromatch": {
"version": "4.0.5",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
"version": "4.0.8",
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
"integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
"dev": true,
"license": "MIT",
"dependencies": {
"braces": "^3.0.2",
"braces": "^3.0.3",
"picomatch": "^2.3.1"
},
"engines": {
@ -3242,9 +3244,9 @@
}
},
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"version": "2.1.3",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
"integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
"license": "MIT"
},
"node_modules/negotiator": {
@ -3264,9 +3266,9 @@
"license": "MIT"
},
"node_modules/node-abi": {
"version": "3.62.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.62.0.tgz",
"integrity": "sha512-CPMcGa+y33xuL1E0TcNIu4YyaZCxnnvkVaEXrsosR3FxN+fV8xvb7Mzpb7IgKler10qeMkE6+Dp8qJhpzdq35g==",
"version": "3.67.0",
"resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.67.0.tgz",
"integrity": "sha512-bLn/fU/ALVBE9wj+p4Y21ZJWYFjUXLXPi/IewyLZkx3ApxKDNBWCKdReeKOtD8dWpOdDCeMyLh6ZewzcLsG2Nw==",
"license": "MIT",
"dependencies": {
"semver": "^7.3.5"
@ -3405,6 +3407,7 @@
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
"integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
"deprecated": "This package is no longer supported.",
"license": "ISC",
"dependencies": {
"are-we-there-yet": "^3.0.0",
@ -3699,18 +3702,6 @@
"node": ">=4"
}
},
"node_modules/pause-stream": {
"version": "0.0.11",
"resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
"integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
"license": [
"MIT",
"Apache2"
],
"dependencies": {
"through": "~2.3"
}
},
"node_modules/pe-library": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/pe-library/-/pe-library-1.0.1.tgz",
@ -3888,21 +3879,6 @@
"node": ">=10"
}
},
"node_modules/ps-tree": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
"integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==",
"license": "MIT",
"dependencies": {
"event-stream": "=3.3.4"
},
"bin": {
"ps-tree": "bin/ps-tree.js"
},
"engines": {
"node": ">= 0.10"
}
},
"node_modules/pump": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
@ -4205,15 +4181,16 @@
}
},
"node_modules/rfdc": {
"version": "1.3.1",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.1.tgz",
"integrity": "sha512-r5a3l5HzYlIC68TpmYKlxWjmOP6wiPJ1vWv2HeLhNsRZMrCkxeqxiHlQ21oXmQ4F3SiryXBHhAD7JZqvOJjFmg==",
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
"integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
"license": "MIT"
},
"node_modules/rimraf": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
"integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
"deprecated": "Rimraf versions prior to v4 are no longer supported",
"license": "ISC",
"dependencies": {
"glob": "^7.1.3"
@ -4295,9 +4272,9 @@
"optional": true
},
"node_modules/semver": {
"version": "7.6.2",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz",
"integrity": "sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==",
"version": "7.6.3",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
"integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
"license": "ISC",
"bin": {
"semver": "bin/semver.js"
@ -4489,23 +4466,11 @@
}
},
"node_modules/spdx-license-ids": {
"version": "3.0.17",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.17.tgz",
"integrity": "sha512-sh8PWc/ftMqAAdFiBu6Fy6JUOYjqDJBJvIhpfDMyHrr0Rbp5liZqd4TjtQ/RgfLjKFZb+LMx5hpml5qOWy0qvg==",
"version": "3.0.20",
"resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.20.tgz",
"integrity": "sha512-jg25NiDV/1fLtSgEgyvVyDunvaNHbuwF9lfNV17gSmPFAlYzdfNBlLtLzXTevwkPj7DhGbmN9VnmJIgLnhvaBw==",
"license": "CC0-1.0"
},
"node_modules/split": {
"version": "0.3.3",
"resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
"integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
"license": "MIT",
"dependencies": {
"through": "2"
},
"engines": {
"node": "*"
}
},
"node_modules/sprintf-js": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
@ -4524,15 +4489,6 @@
"node": "^12.13.0 || ^14.15.0 || >=16.0.0"
}
},
"node_modules/stream-combiner": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
"integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
"license": "MIT",
"dependencies": {
"duplexer": "~0.1.1"
}
},
"node_modules/string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
@ -4683,24 +4639,6 @@
"node": ">=8"
}
},
"node_modules/terminate": {
"version": "2.6.1",
"resolved": "https://registry.npmjs.org/terminate/-/terminate-2.6.1.tgz",
"integrity": "sha512-0kdr49oam98yvjkVY+gfUaT3SMaJI6Sc+yijJjU+qhat+0NQKQn60OsIZZeKyVgTO0/33nRa3HowRbpw3A7u9A==",
"license": "GPL-2.0",
"dependencies": {
"ps-tree": "^1.2.0"
},
"engines": {
"node": ">=12"
}
},
"node_modules/through": {
"version": "2.3.8",
"resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
"integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
"license": "MIT"
},
"node_modules/to-regex-range": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
@ -4761,9 +4699,9 @@
"license": "MIT"
},
"node_modules/typescript": {
"version": "5.4.5",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz",
"integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==",
"version": "5.6.2",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.2.tgz",
"integrity": "sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==",
"license": "Apache-2.0",
"bin": {
"tsc": "bin/tsc",
@ -4774,9 +4712,9 @@
}
},
"node_modules/undici-types": {
"version": "5.26.5",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
"integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
"version": "6.19.8",
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
"license": "MIT"
},
"node_modules/unique-filename": {

View file

@ -1,6 +1,6 @@
{
"name": "dsr",
"version": "1.8.3",
"version": "1.9.3",
"description": "Discord Video Sharing",
"main": "./dist/main.js",
"scripts": {
@ -21,18 +21,20 @@
"@electron-forge/maker-zip": "^7.4",
"ffmpeg-static": "^5.2",
"ffprobe-static": "^3.1",
"terminate": "^2.6",
"typescript": "^5.4"
"typescript": "^5.6"
},
"devDependencies": {
"@electron-forge/cli": "^7.4",
"@types/ffprobe-static": "^2.0",
"electron": "^30.0"
"electron": "^32.0"
},
"config": {
"forge": {
"packagerConfig": {
"icon": "./image/icon.ico"
"icon": "./image/icon.ico",
"asarOptions": {
"unpack": "**/node_modules/*-static/**"
}
},
"makers": [
{

View file

@ -1,18 +1,19 @@
import { app, BrowserWindow, dialog, ipcMain, Notification } from "electron";
import { statSync } from "fs";
import { statSync, copyFileSync } from "fs";
import {
deleteFile,
deleteTwoPassFiles,
execute,
getNewFilename,
getVideoDuration,
getNumberOfAudioTracks,
printAndDevTool,
processes,
} from "./utils/misc";
import path = require("path");
import ffmpegPath = require("ffmpeg-static");
const kill = require("terminate");
import ffmpeg = require("ffmpeg-static");
const ffmpegPath = `${ffmpeg}`.replace("app.asar", "app.asar.unpacked");
let error = false;
@ -25,7 +26,7 @@ const metadataAudio = `-metadata:s:a:0 title="System sounds and microphone" \
-metadata:s:a:1 title="System sounds" \
-metadata:s:a:2 title="Microphone"`;
const extraArgs = "-movflags +faststart";
const shareOpt = "-movflags +faststart";
/** Register a new error */
const registerError = (win: BrowserWindow, err: string) => {
@ -50,6 +51,11 @@ const createWindow = () => {
return win;
};
// For notification on Windows
if (process.platform === "win32") {
app.setAppUserModelId(app.name);
}
/* Ready to create the window */
app.whenReady().then(() => {
const win = createWindow();
@ -78,54 +84,27 @@ app.whenReady().then(() => {
const getFilename = (filepath: string) => path.parse(filepath).base;
/** Merge all audios track of a video into one
* In case video have only one track, silently pass */
* In case video doesn't have exactly two audio streams, silently pass */
const mergeAudio = async (file: string) => {
const tmpFile = getNewFilename(file, "TMP_");
let outFile;
// One track for the video
let nbTracks = 1;
const nbTracks = getNumberOfAudioTracks(file);
// Merge 2 audio
// See: https://trac.ffmpeg.org/wiki/AudioChannelManipulation#a2stereostereo
await execute(
`"${ffmpegPath}" -y \
-i "${file}" \
-filter_complex "[0:a]amerge=inputs=2[a]" -ac 2 -map 0:v -map "[a]" \
-c:v copy \
"${tmpFile}"`
)
.catch(async (e) => {
if (
`${e}`.includes(
"Cannot find a matching stream for unlabeled input pad 1 on filter"
)
) {
// Only one audio in the file
outFile = getNewFilename(file, "(processed) ");
nbTracks += 1;
// Do a copy
await execute(`"${ffmpegPath}" -y \
-i "${file}" \
-codec copy \
${extraArgs} \
"${outFile}"`).catch((e) => registerError(win, e));
// We throw the error since we do not want to merge any audio
return Promise.resolve("skip");
} else {
// Error handling
registerError(win, e);
}
})
.then(async (val) => {
if (val == "skip") {
return;
}
switch (nbTracks) {
case 2:
// Merge 2 audio
// See: https://trac.ffmpeg.org/wiki/AudioChannelManipulation#a2stereostereo
await execute(
`"${ffmpegPath}" -y \
-i "${file}" \
-filter_complex "[0:a]amerge=inputs=2[a]" -ac 2 -map 0:v -map "[a]" \
-c:v copy \
"${tmpFile}"`
);
outFile = getNewFilename(file, "(merged audio) ");
nbTracks += 3;
// Add merged audio as first position to original video and make it default
// About disposition: https://ffmpeg.org/ffmpeg.html#Main-options
// Also rename all tracks accordingly to what they are
@ -135,13 +114,21 @@ app.whenReady().then(() => {
-map 0 -map 1:a -c:v copy \
-disposition:a 0 -disposition:a:0 default \
${metadataAudio} \
${extraArgs} \
"${outFile}"`
).catch((e) => registerError(win, e));
// Delete the temporary video file
deleteFile(tmpFile);
});
break;
default:
// Other cases: no merge needed
outFile = getNewFilename(file, "(nomerge) ");
// Do a copy
copyFileSync(file, outFile);
break;
}
const duration = getVideoDuration(outFile);
const stats = statSync(outFile);
@ -160,7 +147,7 @@ app.whenReady().then(() => {
bitrate: number,
nbTracks: number
) => {
const audioBitrate = 400; // keep some room
const audioBitrate = 500; // keep some room
let videoBitrate = bitrate - audioBitrate;
const finalFile = getNewFilename(file, "Compressed - ");
@ -168,8 +155,8 @@ app.whenReady().then(() => {
// Trash the output, depends on the platform
const nul = process.platform === "win32" ? "NUL" : "/dev/null";
// Mapping of tracks for FFMPEG
const mappingTracks = Array(nbTracks)
// Mapping of tracks for FFMPEG, adding 1 for the video stream
const mappingTracks = Array(nbTracks + 1)
.fill("-map 0:")
.map((str, index) => {
return str + index;
@ -186,7 +173,7 @@ app.whenReady().then(() => {
hwAcc = "-hwaccel cuda";
// Increase video bitrate
videoBitrate = Math.floor(videoBitrate * 1.85);
videoBitrate = Math.floor(videoBitrate * 1.7);
}
// Compress the video
@ -202,7 +189,7 @@ app.whenReady().then(() => {
-c:v ${codec} -b:v ${videoBitrate}k -pass 2 -c:a copy \
${mappingTracks} -f mp4 \
${metadataAudio} \
${extraArgs} \
${shareOpt} \
"${finalFile}"`
).catch((e) => registerError(win, e));
@ -215,6 +202,25 @@ app.whenReady().then(() => {
return finalFile;
};
/** Move metadata at the begenning of the file */
const moveMetadata = async (file: string) => {
const finalFile = getNewFilename(file, "Broadcastable - ");
// Optimize for streaming
await execute(
`"${ffmpegPath}" -y \
-i "${file}" \
-map 0 -codec copy \
${shareOpt} \
"${finalFile}"`
).catch((e) => registerError(win, e));
// Delete the old video file
deleteFile(file);
return finalFile;
};
/* Context bridge */
ipcMain.handle("argv", () => process.argv);
ipcMain.handle("allowedExtensions", () => moviesFilter);
@ -226,13 +232,14 @@ app.whenReady().then(() => {
(_, file: string, bitrate: number, nbTracks: number) =>
reduceSize(file, bitrate, nbTracks)
);
ipcMain.handle("moveMetadata", (_, file: string) => moveMetadata(file));
ipcMain.handle("exit", () => (error ? {} : app.quit()));
ipcMain.handle("confirmation", (_, text: string) => confirmation(text));
});
app.on("window-all-closed", () => {
processes.forEach((process) => {
kill(process.pid);
process.stdin.write("q");
});
app.quit();

View file

@ -15,6 +15,7 @@ contextBridge.exposeInMainWorld("internals", {
mergeAudio: (file: string) => ipcRenderer.invoke("mergeAudio", file),
reduceSize: (file: string, bitrate: number, nbTracks: number) =>
ipcRenderer.invoke("reduceSize", file, bitrate, nbTracks),
moveMetadata: (file: string) => ipcRenderer.invoke("moveMetadata", file),
exit: () => ipcRenderer.invoke("exit"),
confirmation: (text: string) => ipcRenderer.invoke("confirmation", text),
});

View file

@ -18,6 +18,7 @@ let internals: {
bitrate: number,
nbTracks: number
) => Promise<string>;
moveMetadata: (file: string) => Promise<string>;
confirmation: (text: string) => Promise<void>;
};
@ -55,13 +56,16 @@ const getFiles = async () => {
/** Returns maximum allowed size for files in MB */
const fetchMaxSize = async () => {
const argv = await internals.argv();
if (argv.includes("/nitro")) {
if (argv.includes("/nitrobasic")) {
// Nitro Basic user
return 50;
} else if (argv.includes("/nitro")) {
// Nitro user
return 500;
} else {
// Free user
return 25;
}
// Free user
return 25;
};
/** Either replace the message, or add some info */
@ -133,6 +137,11 @@ const main = async () => {
bitrate,
newFile.nbTracks
);
} else {
updateMessage(`\nPréparation pour le partage...`, true, Mode.Append);
// Move the metadata to make it playable before everything is downloaded
finalTitle = await internals.moveMetadata(newFile.title);
}
// Append title to the list of processed files

View file

@ -1,9 +1,11 @@
import ffprobe = require("ffprobe-static");
import child_process = require("child_process");
import path = require("path");
import { BrowserWindow } from "electron";
import { existsSync, unlink } from "fs";
import ffprobe = require("ffprobe-static");
const ffprobePath = ffprobe.path.replace("app.asar", "app.asar.unpacked");
export const processes: child_process.ChildProcess[] = [];
/** Create a new filename from the OG one */
@ -14,11 +16,18 @@ export const getNewFilename = (ogFile: string, part: string) => {
/** Return the duration of a video in second */
export const getVideoDuration = (file: string) => {
const command = `"${ffprobe.path}" -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 "${file}"`;
const command = `"${ffprobePath}" -v error -show_entries format=duration -of default=noprint_wrappers=1:nokey=1 "${file}"`;
const durationString = child_process.execSync(command).toString().trim();
return parseFloat(durationString);
};
/** Return the number of audio tracks */
export const getNumberOfAudioTracks = (file: string) => {
const command = `"${ffprobePath}" -v error -show_entries stream=index -select_streams a -of json "${file}"`;
const result = child_process.execSync(command, { encoding: "utf8" });
return JSON.parse(result).streams.length;
};
/** Print an error to the console and open the dev tool panel */
export const printAndDevTool = (win: BrowserWindow, err: string) => {
win.webContents.openDevTools();