ajout du temps des vidéos et compatibilité sur Windows

Zaruike · Oct 28, 2017 · 9c47a5d · 9c47a5d
1 parent 10b372f
commit 9c47a5d
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 16 deletions.
diff --git a/music.js b/music.js
@@ -3,7 +3,7 @@
 const config = require('./config.json');
 const tool = require('./tool.js');
 const ytdl = require('ytdl-core');
-
+const ySearch = require("youtube-search");
 const Song = require('./obj/Song.js');
 const MusicPlayer = require('./obj/MusicPlayer.js');
 
@@ -76,20 +76,31 @@ function processInput(msg, guild) {
 }
 
 function processSearch(msg, guild, searchQuery) {
-    searchQuery = 'ytsearch1:' + searchQuery;
-    youtubeDL.getInfo(searchQuery, ['--extract-audio'], (err, song) => {
+const opts = {
+    maxResults: 3,
+    key: config.youtube_api_key
+};
+    ySearch(searchQuery, opts, function (err, results) {
         if (err) {
-            msg.channel.send(`Sorry, I couldn't find matching song.`);
+            msg.channel.send(`Désolé, je ne trouve pas ta musique.`);
             return console.log(err);
         }
-        guild.queueSong(new Song(song.title, song.url, 'search'));
-
-        msg.channel.send(
-            `Enqueued ${tool.wrap(song.title.trim())} requested by ${tool.wrap(msg.author.username + '#' + msg.author.discriminator)} ${tool.inaHappy}`
+        for (var y = 0; results[y].kind === 'youtube#channel'; y++);
+        ytdl.getInfo(results[y].link, function (err, song) {
+            if (err) {
+                msg.channel.send(`Désolé, je ne trouve pas ta musique.`);
+                return console.log(err);
+            }
+            const author  = msg.author.username + '#' + msg.author.discriminator;
+            guild.queueSong(new Song(song.title, song.video_url, 'youtube', author, song.length_seconds));
+                    msg.channel.send(
+            `Enqueued ${tool.wrap(song.title.trim())} (\`${song.length_seconds}\`) requested by ${tool.wrap(author)}`
         );
 
         if (guild.status != 'playing')
             guild.playSong(msg, guild);
+
+        });
     });
 }
 
@@ -101,17 +112,18 @@ const processYoutube = {
     Processes a Youtube song, pushing it to the queue.
     @param {String} url The URL of the new song.
     */
-    song(msg, guild, url) {
+    song(msg, guild, url, time) {
         ytdl.getInfo(url, (err, song) => {
             if (err) {
                 console.log(err);
                 msg.channel.send(`Sorry I couldn't queue your song.`);
                 return;
             }
 
-            guild.queueSong(new Song(song.title, url, 'youtube'));
+console.log(guild.queueSong(new Song(song.title, url, 'youtube', '0:00')));
+            guild.queueSong(new Song(song.title, url, 'youtube', '0:00'));
             msg.channel.send(
-                `Enqueued ${tool.wrap(song.title.trim())} requested by ${tool.wrap(msg.author.username + '#' + msg.author.discriminator)} ${tool.inaHappy}`
+                `Enqueued ${tool.wrap(song.title.trim())} requested by ${tool.wrap(msg.author.username + '#' + msg.author.discriminator)}`
             );
             if (guild.status != 'playing') {
                 guild.playSong(msg);
@@ -180,7 +192,7 @@ const processYoutube = {
             }
 
             msg.channel.send(
-                `Enqueued ${tool.wrap(playlistItems.length)} songs from ${tool.wrap(playlistTitle)} requested by ${tool.wrap(msg.author.username + '#' + msg.author.discriminator)} ${tool.inaHappy}`
+                `Enqueued ${tool.wrap(playlistItems.length)} songs from ${tool.wrap(playlistTitle)} requested by ${tool.wrap(msg.author.username + '#' + msg.author.discriminator)}`
             );
 
             if (guild.status != 'playing') {
@@ -211,3 +223,4 @@ function timer() {
 setInterval(timer, 10000);
 
 
+
diff --git a/obj/MusicPlayer.js b/obj/MusicPlayer.js
@@ -45,8 +45,7 @@ class MusicPlayer {
             resolveVoiceChannel.call(this).then(() => {
                 let song = this.queue[0];
                 let stream = song.getStream();
-
-                this.musicChannel.send(`:notes: Now playing ${tool.wrap(song.title)}`);
+                this.musicChannel.send(`:notes: Now playing ${tool.wrap(song.title)} (\`${song.time}\`) requested by ${tool.wrap(song.author)}`);
                 this.changeStatus('playing');
                 this.dispatch = this.voiceConnection.playStream(stream, {
                     passes: 2,
@@ -134,7 +133,7 @@ class MusicPlayer {
             try {
                 let queueString = '';
                 for (let i = 0; i < this.queue.length && i < 15; i++)
-                    queueString += `${i + 1}. ${this.queue[i].title}\n`;
+                    queueString += `${i + 1}. ${this.queue[i].title} (\`${this.queue[i].time}\`) requested by ${this.queue[i].author}\n`;
                 if (this.queue.length > 15)
                     queueString += `\nand ${this.queue.length - 15} more.`;
                 msg.channel.send(queueString, {
@@ -241,3 +240,4 @@ class MusicPlayer {
 
 module.exports = MusicPlayer;
 
+
diff --git a/obj/Song.js b/obj/Song.js
@@ -5,10 +5,12 @@ const ytdl = require('ytdl-core');
 An object representing a song.
 */
 class Song {
-    constructor(title, url, type) {
+    constructor(title, url, type, authorname, time) {
         this.title = title;
         this.url = url;
         this.type = type; //youtube, soundcloud, search
+	this.author = authorname;
+	this.time = time;
     }
 
     getStream() {