Telegram

Procfile

@@ -1 +1 @@
-worker: python3 telegram.py
+worker: bash worker.sh

README.md

@@ -1,9 +1,17 @@
-# Spotify Music Downloader | **<a href="https://telegram.me/SpotifyMusicDownloaderBot"><b>Get it on Telegram</b></a>**
+# Spotify Music Downloader Bot | **<a href="https://telegram.me/SpotifyMusicDownloaderBot"><b>Get it on Telegram</b></a>**
 
 [![made-with-python](https://img.shields.io/badge/Made%20with-Python-1f425f.svg)](https://www.python.org/) [![Open Source Love svg1](https://badges.frapsoft.com/os/v1/open-source.svg?v=103)](https://github.com/ellerbrock/open-source-badges/) [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
-<img align="center" src="https://raw.githubusercontent.com/artyshko/smd/telegram-unstable/Data/header1.png">
-<img align="center" src="https://raw.githubusercontent.com/artyshko/smd/telegram-unstable/Data/header2.png">
-<img align="center" src="https://raw.githubusercontent.com/artyshko/smd/telegram-unstable/Data/header3.png">
-<img align="center" src="https://raw.githubusercontent.com/artyshko/smd/telegram-unstable/Data/header5.png">
-<img align="center" src="https://raw.githubusercontent.com/artyshko/smd/telegram-unstable/Data/header4.png">
+<img align="center" src="https://telegra.ph/file/9aa2dbe8755ec9a1d256a.png">
+<img align="center" src="https://telegra.ph/file/8e8a3a500eaf1d491dbd6.png">
+<img align="center" src="https://telegra.ph/file/ea696ddba7754a7d69cef.png">
+<img align="center" src="https://telegra.ph/file/c0c3ffbff02a90094bce5.png">
+<img align="center" src="https://telegra.ph/file/96f4b501a429619888cb3.png">
+<img align="center" src="https://telegra.ph/file/35c9427fbe65045b765ed.png">
+<img align="center" src="https://telegra.ph/file/f2bade546c719a9c3fc1c.png">
+<img align="center" src="https://telegra.ph/file/38e841982cb6392f12697.png">
+<img align="center" src="https://telegra.ph/file/649ee11b4db6d2a5a21fa.png">
+<img align="center" src="https://telegra.ph/file/3b2d3eef17ba9e6c2a6bc.png">
+<img align="center" src="https://telegra.ph/file/073d93deef71e3e93e528.png">
+<img align="center" src="https://telegra.ph/file/4f284eaa2413a47994124.png">
+<img align="center" src="https://telegra.ph/file/14aed6c4e2ca89dbd4a41.png">

apple.py

@@ -16,7 +16,7 @@ def get(self, url):
 
         url = url + '&l=uk'
 
-        
+
         splitted = str(url).split('/')
         splitted = splitted[:3]+['ua']+splitted[4:]
         url = '/'.join(splitted)

deezer.py

@@ -0,0 +1,73 @@
+import requests
+
+class Deezer(object):
+
+    def __init__(self):
+
+        '''
+       Init function
+       Creating deezer object
+       :return: None
+       '''
+
+        self.__url = 'http://api.deezer.com/'
+
+
+    def getSongInfo(self, id):
+
+        try:
+
+            response = requests.get(f'{self.__url}/track/{id}').json()
+
+            return ({
+                'uri' : f"D{response['id']}T",
+                'name' : response['title'],
+                'artist' : [response['artist']['name']],
+                'album' : response['album']['title'],
+                'image' : response['album']['cover_xl'],
+                'duration_ms' : response['duration']
+            })
+
+        except: return None
+
+    def getAlbum(self, id):
+
+        try:
+
+            response = requests.get(f'{self.__url}/album/{id}').json()
+
+            alb = {
+                'name':response['title'],
+                'artist':response['artist']['name'],
+                'copyright': None,
+                'image':response['cover_xl'],
+            }
+
+            tracks = []
+
+            for item in response['tracks']['data']:
+
+                tracks.append({
+                    'uri' : f"D{item['id']}T",
+                    'name' : item['title'],
+                    'artist' : [item['artist']['name']],
+                    'album' : alb['name'],
+                    'image' : alb['image'],
+                    'preview_url' : item['preview'],
+                    'duration_ms' : item['duration']
+                })
+
+            alb.setdefault(
+                'tracks', tracks
+            )
+
+            return alb
+
+        except: return None
+
+if __name__ == '__main__':
+
+    deezer = Deezer()
+    data = deezer.getSongInfo('636758392')
+
+    print(data)

main.py

@@ -3,6 +3,7 @@
 from youtube import Youtube
 from editor import TagEditor
 from lastfm import LastFM
+from deezer import Deezer
 import sys, getopt, shutil
 import os
 
@@ -22,6 +23,7 @@ def __init__(self):
         self.__spotify = Spotify()
         self.__editor = TagEditor()
         self.__last = LastFM()
+        self.__deezer = Deezer()
 
 
     def __downloadMusicFromYoutube(self, name, uri, dur):
@@ -59,6 +61,9 @@ def getData(self, uri):
     def getLastFMTags(self, name):
         return self.__last.get(name)
 
+    def getDeezerTags(self, id):
+        return self.__deezer.getSongInfo(id)
+
     def getYoutubeMusicInfo(self, url):
         return self.__youtube.getNameFromYoutube(url)
 
@@ -302,9 +307,70 @@ def downloadFromYoutubeMusic(self, url, info):
         else:
             return False, None
 
+    def downloadByDeezerID(self, uri):
+        #get info
+        info = self.__deezer.getSongInfo(uri)
+
+        if info:
+
+            fixed_name = f'{info["artist"][0]} - {info["name"]}'
+            fixed_name = fixed_name.replace('.','')
+            fixed_name = fixed_name.replace(',','')
+            fixed_name = fixed_name.replace("'",'')
+            fixed_name = fixed_name.replace("/","")
+
+            #finding and download from YouTube and tagging
+            if self.__downloadMusicFromYoutube(fixed_name, info['uri'], info['duration_ms']):
+
+                self.__editor.setTags(
+                    data=info
+                )
+
+                cachepath = os.getcwd() + '/cache'
+                fullpath = os.getcwd() + '/Downloads'
+
+                #logging
+                logging.info(f'CACHEPATH {cachepath}')
+                logging.info(f'FULLPATH {fullpath}')
+
+                if not os.path.exists(fullpath):
+                    os.makedirs(fullpath)
+
+                os.rename(
+                    f"{cachepath}/{info['uri']}/{info['uri']}.png",
+                    f"{fullpath}/{info['uri']}.png"
+                )
+                #logging
+                logging.info(f"MOVE TO Downloads/{info['uri']}.png")
+
+                os.rename(
+                    f"{cachepath}/{info['uri']}/{info['uri']}.mp3",
+                    f"{fullpath}/{info['uri']}.mp3"
+                )
+                #logging
+                logging.info(f"MOVE TO Downloads/{info['uri']}.mp3")
+
+                #deleting cache
+                try:
+                    shutil.rmtree(f"cache/{info['uri']}")
+                    #logging
+                    logging.info(f"DELETED cache/{info['uri']}")
+                except:
+                    #logging
+                    logging.error(f"DELETING cache/{info['uri']}")
+
+                return True
+        return False
+
     def search(self, query):
         return self.__spotify.search(query=query)
 
+    def getAlbum(self, uri):
+        return self.__spotify.getAlbum(uri)
+
+    def getAlbumDeezer(self, id):
+        return self.__deezer.getAlbum(id)
+
 
 
 class CLI(object):

requirements.txt

@@ -1,10 +1,12 @@
-mutagen==1.41.0
-lxml==4.2.3
-Flask==0.12.2
-moviepy==0.2.3.5
-requests==2.18.4
-spotipy==2.4.4
-git+git://github.com/nficano/pytube.git
+redis==2.10.6
 imageio==2.3.0
+git+git://github.com/nficano/pytube.git
+spotipy==2.4.4
 pyperclip==1.6.4
+requests==2.18.4
+moviepy==0.2.3.5
+lxml==4.2.3
+mutagen==1.41.0
+Flask==0.12.2
+celery==4.2.1
 beautifulsoup4==4.7.1