Revert the right version

This commit is contained in:
loicbersier 2019-11-09 14:16:56 +01:00
parent a2680250ad
commit ec5b712fef

View file

@ -40,8 +40,17 @@ class ytpCommand extends Command {
} }
async exec(message, args) { async exec(message, args) {
let MAX_CLIPS = 20;
if (args.pool) { if (args.pool) {
return message.channel.send(`here is currently ${fs.readdirSync('./asset/ytp/userVid/').length} videos, you can add yours by doing \`\`${prefix[0]}ytp --add (link or attachment)\`\``); let mp4 = [];
fs.readdirSync('./asset/ytp/userVid/').forEach(file => {
if (file.endsWith('mp4')) {
mp4.push(file);
}
});
return message.channel.send(`There is currently ${mp4.length} videos, you can add yours by doing \`\`${prefix[0]}ytp --add (link or attachment)\`\``);
} }
if (args.add) { if (args.add) {
@ -54,15 +63,21 @@ class ytpCommand extends Command {
} }
if (url) { if (url) {
return youtubedl.exec(url, ['-o', `./asset/ytp/userVid/${message.id}.mp4`], {}, function(err) { return youtubedl.exec(url, ['--format=mp4', '-o', `./asset/ytp/userVid/${message.id}.mp4`], {}, function(err) {
if (err) { if (err) {
console.error(err); console.error(err);
loadingmsg.delete(); loadingmsg.delete();
return message.channel.send('An error has occured, I can\'t download from the link you provided.'); return message.channel.send('An error has occured, I can\'t download from the link you provided. Is it an mp4?');
} else { } else {
let length = fs.readdirSync('./asset/ytp/userVid/').length; let mp4 = [];
fs.readdirSync('./asset/ytp/userVid/').forEach(file => {
if (file.endsWith('mp4')) {
mp4.push(file);
}
});
loadingmsg.delete(); loadingmsg.delete();
return message.reply(`Video sucessfully added to the pool! There is now ${length} videos`); return message.reply(`Video sucessfully added to the pool! There is now ${mp4.length} videos`);
} }
}); });
} else { } else {
@ -71,21 +86,36 @@ class ytpCommand extends Command {
} }
} }
if (!message.channel.nsfw && !args.force) return message.channel.send('Please execute this command in an NSFW channel ( Content might not be NSFW but since the video are user submitted better safe than sorry ) OR --force to make the command work outside of nsfw channel BE AWARE THAT IT WON\'T CHANGE THE FINAL RESULT SO NSFW CAN STILL HAPPEN');
let loadingmsg = await message.channel.send(`Processing, this can take a **long** time, i'll ping you when i finished <a:loadingmin:527579785212329984>\nSome info: There is currently ${fs.readdirSync('./asset/ytp/userVid/').length} videos, you can add yours by doing \`\`${prefix[0]}ytp --add (link or attachment)\`\``);
// Read userVid folder and only take .mp4 if (!message.channel.nsfw && !args.force) return message.channel.send('Please execute this command in an NSFW channel ( Content might not be NSFW but since the video are user submitted better safe than sorry ) OR --force to make the command work outside of nsfw channel BE AWARE THAT IT WON\'T CHANGE THE FINAL RESULT SO NSFW CAN STILL HAPPEN');
// Read userVid folder and select random vid and only take .mp4
let mp4 = [];
let asset = []; let asset = [];
fs.readdir('./asset/ytp/userVid/', (err, files) => { let files = fs.readdirSync('./asset/ytp/userVid/');
// Count number of total vid
files.forEach(file => { files.forEach(file => {
if (file.endsWith('.mp4')) { if (file.endsWith('mp4')) {
asset.push(`./asset/ytp/userVid/${file}`); mp4.push(file);
} }
}); });
// Select random vid depending on the amount of MAX_CLIPS
for (let i = 0; i < MAX_CLIPS; i++) {
let random = Math.floor(Math.random() * files.length);
let vid = `./asset/ytp/userVid/${files[random]}`;
if (files[random].endsWith('mp4')) {
if (!asset.includes(vid)) {
asset.push(vid);
}
}
}
let loadingmsg = await message.channel.send(`Processing, this can take a **long** time, i'll ping you when i finished <a:loadingmin:527579785212329984>\nSome info: There is currently ${mp4.length} videos, you can add yours by doing \`\`${prefix[0]}ytp --add (link or attachment)\`\``);
let options = { let options = {
debug: false, // Better set this to false to avoid flood in console debug: false, // Better set this to false to avoid flood in console
MIN_STREAM_DURATION: Math.floor((Math.random() * 2) + 1), // Random duration of video clip MAX_STREAM_DURATION: Math.floor((Math.random() * 3) + 1), // Random duration of video clip
sources: './asset/ytp/sources/', sources: './asset/ytp/sources/',
sounds: './asset/ytp/sounds/', sounds: './asset/ytp/sounds/',
music: './asset/ytp/music/', music: './asset/ytp/music/',
@ -94,7 +124,7 @@ class ytpCommand extends Command {
sourceList: asset, sourceList: asset,
outro: './asset/ytp/outro.mp4', // Need an outro or it won't work outro: './asset/ytp/outro.mp4', // Need an outro or it won't work
OUTPUT_FILE: `${os.tmpdir()}/${message.id}_YTP.mp4`, OUTPUT_FILE: `${os.tmpdir()}/${message.id}_YTP.mp4`,
MAX_CLIPS: 20, MAX_CLIPS: MAX_CLIPS,
transitions: true, transitions: true,
effects: { effects: {
effect_RandomSound: true, effect_RandomSound: true,
@ -107,7 +137,7 @@ class ytpCommand extends Command {
effect_SpeedUp: true, effect_SpeedUp: true,
effect_SlowDown: true, effect_SlowDown: true,
effect_Dance: true, effect_Dance: true,
effect_Squidward: false effect_Squidward: false // Not yet implemented
} }
}; };
@ -119,11 +149,11 @@ class ytpCommand extends Command {
return message.channel.send('Whoops, look like the vid might be too big for discord, my bad, please try again'); return message.channel.send('Whoops, look like the vid might be too big for discord, my bad, please try again');
}); });
}) })
.catch(() => { .catch(err => {
console.error(err);
loadingmsg.delete(); loadingmsg.delete();
return message.reply('Oh no! An error has occured!'); return message.reply('Oh no! An error has occured!');
}); });
});
} }
} }