Added poetry as an environment package

README.md

@@ -11,15 +11,16 @@ The fullset of funcitonality offered by this is:
 
 
 ### Installation
-```sh
-$ pip3 install -r requirements.txt
+```
+$ pip install poetry
+$ poetry install
 ```
 
 ### Usage
 
 ##### Download Playlist or Album from Web URL
 ```
-$ python3 Download.py
+$ poetry run python run.py
 $ Paste the URL: https://www.jiosaavn.com/album/tum-hi-aana-from-marjaavaan/j9bfphC2728_
 ```
 
@@ -32,34 +33,34 @@ $ Paste the URL: https://www.jiosaavn.com/album/tum-hi-aana-from-marjaavaan/j9bf
 
 #### Download All Albums of an Artist
 ```
-$ python Download.py -artist --album
+$ poetry run python run.py -artist --album
 $ Paste the URL of Artist Profile: https://www.jiosaavn.com/artist/babbal-rai-albums/pRd5ZTGrLv8_
 ``` 
 
 #### Download All Songs of an Artist
 ```
-$ python Download.py -artist --song
+$ poetry run python run.py -artist --song
 $ Paste the URL of Artist Profile: https://www.jiosaavn.com/artist/babbal-rai-albums/pRd5ZTGrLv8_
 ```
 
 
 #### Download All Playlist from your profile
 ```
-$ python3 Download.py -p
+$ poetry run python run.py -p
 $ Enter your Email: your_saavn_email
 $ Enter your Password: your_saavn_password
 ```
 
 #### Download All Albums from your profile
 ```
-$ python3 Download.py -a
+$ poetry run python run.py -a
 $ Enter your Email: your_saavn_email
 $ Enter your Password: your_saavn_password
 ```
 
 #### Download All JioSaavn Originals or Podcast Shows from your profile
 ```
-$ python3 Download.py -s
+$ poetry run python run.py -s
 $ Enter your Email: your_saavn_email
 $ Enter your Password: your_saavn_password
 ```

Download.py → downloader/download.py

@@ -1,4 +1,3 @@
-import ast
 import base64
 import html
 import json
@@ -7,15 +6,14 @@
 import urllib.request
 import sys
 
-import logger
 import requests
 import urllib3.request
 from bs4 import BeautifulSoup
 from mutagen.mp4 import MP4, MP4Cover
 from pySmartDL import SmartDL
 from requests.packages.urllib3.exceptions import InsecureRequestWarning
 
-from pyDes import *
+from downloader.pyDes import *
 
 # Pre Configurations
 urllib3.disable_warnings()
@@ -386,8 +384,7 @@ def downloadSongs(songs_json, album_name='songs', artist_name='Non-Artist'):
             print('Download Error' + str(e))
 
 
-if __name__ == '__main__':
-    album_name = "songs"
+def main():
 
     if len(sys.argv) > 1 and sys.argv[1].lower() == "-p":
         downloadAllPlayList(getLibrary())