diff --git a/modules/stream/types.js b/modules/stream/types.js
index 6dc54915..950025af 100644
--- a/modules/stream/types.js
+++ b/modules/stream/types.js
@@ -1,7 +1,7 @@
import { spawn } from "child_process";
import ffmpeg from "ffmpeg-static";
import got from "got";
-import { genericUserAgent } from "../config.js";
+import { ffmpegArgs, genericUserAgent } from "../config.js";
import { msToTime } from "../sub/api-helper.js";
import { internalError } from "../sub/errors.js";
import loc from "../sub/loc.js";
@@ -16,11 +16,9 @@ export async function streamDefault(streamInfo, res) {
isStream: true
});
stream.pipe(res).on('error', (err) => {
- internalError(res);
throw Error("File stream pipe error.");
});
stream.on('error', (err) => {
- internalError(res);
throw Error("File stream error.")
});
} catch (e) {
@@ -42,18 +40,9 @@ export async function streamLiveRender(streamInfo, res) {
'-i', 'pipe:4',
'-map', '0:v',
'-map', '1:a',
- '-c:v', 'copy',
- '-c:a', 'copy',
];
- if (format == 'mp4') {
- args.push('-movflags', 'frag_keyframe+empty_moov');
- if (streamInfo.service == "youtube") {
- args.push('-t', msToTime(streamInfo.time));
- }
- } else if (format == 'webm') {
- args.push('-t', msToTime(streamInfo.time));
- }
- args.push('-f', format, 'pipe:5');
+ args = args.concat(ffmpegArgs[format])
+ args.push('-t', msToTime(streamInfo.time), '-f', format, 'pipe:5');
const ffmpegProcess = spawn(ffmpeg, args, {
windowsHide: true,
stdio: [
@@ -63,25 +52,20 @@ export async function streamLiveRender(streamInfo, res) {
});
ffmpegProcess.on('error', (err) => {
ffmpegProcess.kill();
- internalError(res);
});
audio.on('error', (err) => {
ffmpegProcess.kill();
- internalError(res);
});
video.on('error', (err) => {
ffmpegProcess.kill();
- internalError(res);
});
res.setHeader('Content-Disposition', `attachment; filename="${streamInfo.filename}"`);
ffmpegProcess.stdio[5].pipe(res);
video.pipe(ffmpegProcess.stdio[3]).on('error', (err) => {
ffmpegProcess.kill();
- internalError(res);
});
audio.pipe(ffmpegProcess.stdio[4]).on('error', (err) => {
ffmpegProcess.kill();
- internalError(res);
});
} else {
res.status(400).json({ status: "error", text: loc('en', 'apiError', 'corruptedVideo') });
@@ -113,17 +97,14 @@ export async function streamAudioOnly(streamInfo, res) {
});
ffmpegProcess.on('error', (err) => {
ffmpegProcess.kill();
- internalError(res);
});
audio.on('error', (err) => {
ffmpegProcess.kill();
- internalError(res);
});
res.setHeader('Content-Disposition', `attachment; filename="${streamInfo.filename}"`);
ffmpegProcess.stdio[4].pipe(res);
audio.pipe(ffmpegProcess.stdio[3]).on('error', (err) => {
ffmpegProcess.kill();
- internalError(res);
});
} catch (e) {
internalError(res);
diff --git a/modules/sub/current-commit.js b/modules/sub/current-commit.js
index b9c37cff..869ff785 100644
--- a/modules/sub/current-commit.js
+++ b/modules/sub/current-commit.js
@@ -1,5 +1,8 @@
import { execSync } from "child_process";
-export default function() {
+export function shortCommit() {
return execSync('git rev-parse --short HEAD').toString().trim()
+}
+export function getCommitInfo() {
+ return execSync(`git show -s --format='%s;;;%B'`).toString().trim().slice(1,-1).replace(/[\r\n]/gm, '\n').split(';;;')
}
\ No newline at end of file
diff --git a/modules/sub/loc.js b/modules/sub/loc.js
index d8dc0107..91c925af 100644
--- a/modules/sub/loc.js
+++ b/modules/sub/loc.js
@@ -1,4 +1,4 @@
-import { supportedLanguages, appName } from "../config.js";
+import { supportedLanguages, appName, repo } from "../config.js";
import loadJson from "./load-json.js";
export default function(lang, cat, string, replacement) {
@@ -8,7 +8,7 @@ export default function(lang, cat, string, replacement) {
try {
let str = loadJson(`./strings/${lang}/${cat}.json`);
if (str && str[string]) {
- let s = str[string].replace(/\n/g, ' ').replace(/{appName}/g, appName)
+ let s = str[string].replace(/\n/g, ' ').replace(/{appName}/g, appName).replace(/{repo}/g, repo)
if (replacement) {
s = s.replace(/{s}/g, replacement)
}
diff --git a/package.json b/package.json
index f543178f..b48a2f6f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "cobalt",
"description": "easy to use social media downloader",
- "version": "2.1",
+ "version": "2.2",
"author": "wukko",
"exports": "./cobalt.js",
"type": "module",
@@ -14,13 +14,13 @@
},
"repository": {
"type": "git",
- "url": "git+https://github.com/wukko/cobalt-web.git"
+ "url": "git+https://github.com/wukko/cobalt.git"
},
"license": "MIT",
"bugs": {
- "url": "https://github.com/wukko/cobalt-web/issues"
+ "url": "https://github.com/wukko/cobalt/issues"
},
- "homepage": "https://github.com/wukko/cobalt-web#readme",
+ "homepage": "https://github.com/wukko/cobalt#readme",
"dependencies": {
"cors": "^2.8.5",
"dotenv": "^16.0.1",
diff --git a/strings/en/accessibility.json b/strings/en/accessibility.json
index 3f2714ed..946027ef 100644
--- a/strings/en/accessibility.json
+++ b/strings/en/accessibility.json
@@ -6,5 +6,5 @@
"changelog": "Changelog",
"close": "Close button",
"alwaysVisibleButton": "Keep the download button always visible",
- "donate": "Support {appName} by donating"
+ "donate": "Support development of {appName} by donating"
}
\ No newline at end of file
diff --git a/strings/en/apiError.json b/strings/en/apiError.json
index 13daeecb..9a1969d7 100644
--- a/strings/en/apiError.json
+++ b/strings/en/apiError.json
@@ -2,21 +2,20 @@
"generic": "something went wrong and i couldn't get the video. you can try again,",
"notSupported": "it seems like this service is not supported yet or your link is invalid.",
"brokenLink": "{s} is supported, but something is wrong with your link.",
- "noURL": "something is wrong with your link. it's probably missing. i can't guess what you want to download!",
- "badResolution": "your screen resolution is not supported. try a different device.",
+ "noURL": "i can't guess what you want to download! please give me a link.",
"tryAgain": "\ncheck the link and try again.",
- "letMeKnow": "but if issue persists, please let me know.",
- "fatal": "something went wrong and page couldn't be rendered. if you want me to fix this, please contact me. it'd be useful if you provided the commit hash ({s}) along with recreation steps. thank you :D",
+ "letMeKnow": "but if issue persists, please let me know.",
+ "fatal": "something went wrong and page couldn't render. if you want me to fix this, please contact me. it'd be useful if you provided the commit hash ({s}) along with recreation steps. thank you :D",
"rateLimit": "you're making way too many requests. calm down and try again in a few minutes.",
"youtubeFetch": "couldn't fetch metadata. check if your link is correct and try again.",
- "youtubeLimit": "current length limit is {s} minutes. what you tried to download was longer than {s} minutes.",
- "youtubeBroke": "something went wrong with info fetching. you can try a different format or just try again later.",
- "corruptedVideo": "oddly enough the requested video is corrupted on its origin server. youtube does this sometimes because it's fucking stupid.",
- "corruptedAudio": "oddly enough the requested audio is corrupted on its origin server. youtube does this sometimes because it's fucking stupid.",
- "noInternet": "it seems like either {appName} api is down or there's no internet. check your connection and try again.",
+ "youtubeLimit": "current length limit is {s} minutes. what you tried to download was longer than that. pick something else to download!",
+ "youtubeBroke": "something went wrong with info fetching. you can try a different format and resoltuion or just try again later.",
+ "corruptedVideo": "oddly enough the requested video is corrupted on its origin server. youtube does this sometimes because it's a hot pile of mess.",
+ "corruptedAudio": "oddly enough the requested audio is corrupted on its origin server. youtube does this sometimes because it's a hot pile of mess.",
+ "noInternet": "it seems like there's no internet or {appName} api is down. check your connection and try again.",
"liveVideo": "i can't download a live video. wait for stream to finish and try again.",
"nothingToDownload": "it seems like there's nothing to download. try another link!",
- "cantConnectToAPI": "i couldn't connect to {s} api. seems like either {s} is down or server ip got blocked. try again later.",
+ "cantConnectToAPI": "i couldn't connect to {s} api. seems like either {s} is down or {appName} server ip got blocked. try again later.",
"noStreamID": "there's no such stream id.",
"noType": "there's no such expected response type."
}
\ No newline at end of file
diff --git a/strings/en/changelog.json b/strings/en/changelog.json
index 6b8c35c6..c11d0d83 100644
--- a/strings/en/changelog.json
+++ b/strings/en/changelog.json
@@ -1,5 +1,5 @@
{
- "subtitle": "everything is new! (v.2.1)",
- "text": "- added support for: bilibili.com, youtube, youtube music, reddit, vk;\n- remade the way downloads are handled;\n- added proper website branding;\n- added settings, donations, and changelog menu;\n- added manual theme picker;\n- added format picker for youtube;\n- added quality picker for youtube and vk downloads (bilibili and twitter later);\n- improved usability;\n- upgraded the download button to be adaptive depending on current status;\n- popups are now adaptive, too;\n- better scalability;\n- took out trash;\n- moved from commonjs to ems;\n- overall revamp of backend and frontend;\n- fixed various issues that were present in older version.",
+ "subtitle": "beginning of 2.2",
+ "text": "- added download popup to solve the issue with downloads on ios\n- merged big and small popups into one\n- made buttons in donation menu act like buttons\n- began to clean up localisation\n- added ability to embed repo url into localisation strings\n- moved ffmpeg args to config for more flexibility (and hopefully future changes)\n- removed error response in stream that could result in a crash\n- removed notice for ios users from about cause it's no longer relevant\n- made error popup look and act like the rest\n- a tiny bit of clean up",
"github": ">> see previous changes and contribute on github"
}
\ No newline at end of file
diff --git a/strings/en/desc.json b/strings/en/desc.json
index d2d1d19d..0868081f 100644
--- a/strings/en/desc.json
+++ b/strings/en/desc.json
@@ -1,15 +1,18 @@
{
"input": "paste the link here",
- "about": "{appName} is your go-to place for social media downloads. zero ads or other creepy bullshit attached. simply paste a share link and you're ready to rock!",
+ "aboutSummary": "{appName} is your go-to place for social media downloads. zero ads or other creepy bullshit attached. simply paste a share link and you're ready to rock!",
"embed": "save content from social media without creeps following you around",
- "support_1": "currently supported services:",
- "sourcecode": ">> report issues and check out the source code on github",
+ "supportedServices": "currently supported services:",
+ "sourceCode": ">> report issues and check out the source code on github",
"popupBottom": "made with <3 by wukko",
- "noScript": "{appName} uses javascript for api requests and interactive interface. you have to allow javascript to use this site. we don't have ads or any trackers, pinky promise.",
- "ios": "it's impossible to download videos directly from browser on ios. you'll have to open share sheet and select \"save to files\" in order to save videos from twitter. if you don't see that option, you have to install the official \"files\" app from app store first.",
- "iosTitle": "notice for ios users",
- "donationsSub": "it's quite complicated to pay for hosting right now",
- "donations": "you can currently donate only in crypto, because i live under dictatorship and can't use debit cards anywhere outside of country. i don't like crypto the way it is right now, but it's the only way for me to pay for anything (including hosting) online. everything else like paypal is no longer available.",
+ "noScript": "{appName} uses javascript for api requests and interactive interface. you have to allow javascript to use this site. we don't have any ads or trackers, pinky promise.",
+ "donationsSub": "it's a little complicated to pay for hosting right now",
+ "donations": "i don't like crypto how it is right now, but it's the only way for me to pay for anything (including hosting) online. services similar paypal are no longer available too.",
"donateDm": ">> let me know if currency you want to donate isn't listed",
- "clicktocopy": "click to copy"
+ "clickToCopy": "click to copy",
+ "iosDownload": "you have to press and hold the download button and then select \"download video\" in appeared popup to save the video. this is required because you have an ios device.",
+ "normalDownload": "download button opens a new tab with requested video. you can disable this popup in settings.",
+ "download": "download",
+ "copy": "copy url",
+ "open": "open"
}
\ No newline at end of file
diff --git a/strings/en/settings.json b/strings/en/settings.json
index 2cbbc9a8..2b2e8daf 100644
--- a/strings/en/settings.json
+++ b/strings/en/settings.json
@@ -1,20 +1,21 @@
{
- "category-appearance": "appearance",
- "always-visible": "keep >> visible",
- "picker": "always download max quality",
+ "appearance": "appearance",
+ "alwaysVisibleButton": "keep >> visible",
+ "downloadPopupButton": "ask for a way to save",
"format": "download format",
- "format-info": "webm videos are usually higher quality but not all devices can play them. select webm only if you need max quality available. audio only downloads will always be max quality.",
+ "formatInfo": "select webm if you need max quality available. webm videos are usually higher quality but ios devices can't play them natively. all \"audio only\" downloads are max quality.",
"theme": "theme",
- "theme-auto": "auto",
- "theme-light": "light",
- "theme-dark": "dark",
+ "themeAuto": "auto",
+ "themeLight": "light",
+ "themeDark": "dark",
"misc": "miscellaneous",
"general": "downloads",
"quality": "quality",
- "q-max": "max",
- "q-hig": "high\n",
- "q-mid": "medium\n",
- "q-low": "low\n",
- "q-los": "lowest",
- "q-desc": "all resolutions listed here are max values. if there's no video of preferred quality closest one gets picked instead."
+ "qmax": "max",
+ "qhig": "high\n",
+ "qmid": "medium\n",
+ "qlow": "low\n",
+ "qlos": "lowest",
+ "qualityDesc": "all resolutions listed here are max values. if there's no video of preferred quality, closest one gets picked instead.",
+ "extra": "extra"
}
\ No newline at end of file
diff --git a/strings/en/title.json b/strings/en/title.json
index 228b0552..6fb6cc46 100644
--- a/strings/en/title.json
+++ b/strings/en/title.json
@@ -1,7 +1,9 @@
{
- "about": "owo what's this?",
+ "about": "what's {appName}?",
"settings": "settings",
"error": "uh-oh...",
"changelog": "what's new?",
- "donate": "support {appName}"
+ "donate": "support {appName}",
+ "download": "download",
+ "pickDownload": "pick a way to save"
}
\ No newline at end of file