Skip to content

Commit

Permalink
Removed outdated logging module, updated requiments.txt
Browse files Browse the repository at this point in the history
  • Loading branch information
inovachrono committed Jun 24, 2020
1 parent 2062b1a commit 5ac81ae
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 15 deletions.
1 change: 0 additions & 1 deletion download_reloaded.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from bs4 import BeautifulSoup
import requests
import logger

from scripts.helper import argManager, setProxy, scan_url
from scripts.content.playlist import Playlist
Expand Down
4 changes: 0 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
aiohttp==3.6.2
async-timeout==3.0.1
attrs==19.3.0
beautifulsoup4==4.9.0
certifi==2020.4.5.1
chardet==3.0.4
dataclasses==0.7
deprecation==2.1.0
eyeD3==0.9.5
filetype==1.0.7
get==2019.4.13
idna==2.9
idna-ssl==1.1.0
importlib-metadata==1.6.0
logger==1.4
lxml==4.5.0
more-itertools==8.2.0
multidict==4.7.5
mutagen==1.44.0
Expand Down
3 changes: 1 addition & 2 deletions scripts/content/album.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import requests
from requests.packages.urllib3.exceptions import InsecureRequestWarning
import logger
import json

from ..download_manager import Manager
Expand All @@ -25,7 +24,7 @@ def getAlbumID(self, url=None):
try:
res = requests.get(input_url, proxies=self.proxies, headers=self.headers)
except Exception as e:
logger.error('Error accessing website error: ' + str(e))
print('Error accessing website error: {0}'.format(e))
exit()
try:
content_json = res.json()
Expand Down
3 changes: 1 addition & 2 deletions scripts/content/playlist.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import requests
from requests.packages.urllib3.exceptions import InsecureRequestWarning
import json
import logger

from ..download_manager import Manager

Expand All @@ -25,7 +24,7 @@ def getPlaylistID(self, url=None):
try:
res = requests.get(input_url, proxies=self.proxies, headers=self.headers)
except Exception as e:
logger.error('Error accessing website error: ' + str(e))
print('Error accessing website error: {0}'.format(e))
exit()
self.playlistID = res.json()["id"]
return self.playlistID
Expand Down
5 changes: 2 additions & 3 deletions scripts/content/podcast.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from bs4 import BeautifulSoup
import json
import os
import logger

from ..helper import setProxy, argManager
from ..download_manager import Manager
Expand Down Expand Up @@ -45,7 +44,7 @@ def downloadPodcast(self, show_json):
# dec_url = dec_url.replace('_96.mp4', '_320.mp4') # Change in url gives invalid xml
filename = manager.format_filename(episode['title'])
except Exception as e:
logger.error('Download Error' + str(e))
print('Download Error: {0}'.format(e))
try:
location = manager.get_download_location(show_name, season_name, filename)
has_downloaded = manager.start_download("Show: {} - Season: {} - Episode: {}".format(
Expand All @@ -55,7 +54,7 @@ def downloadPodcast(self, show_json):
# TODO: Add tags for to the podcast episodes
print('\n')
except Exception as e:
logger.error('Download Error' + str(e))
print('Download Error: {0}'.format(e))

def dowloadAllPodcasts(self, library_json):
if library_json.get('show') is not None:
Expand Down
5 changes: 2 additions & 3 deletions scripts/download_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import html
import json
import base64
import logger
import os

from pySmartDL import SmartDL
Expand Down Expand Up @@ -64,7 +63,7 @@ def downloadSongs(self, songs_json, album_name='songs', artist_name='Non-Artist'
dec_url = self.get_dec_url(song['encrypted_media_url'])
filename = self.format_filename(song['song'])
except Exception as e:
logger.error('Download Error' + str(e))
print('Download Error: {0}'.format(e))
try:
location = self.get_download_location(artist_name, album_name, filename)
has_downloaded = self.start_download(filename, location, dec_url)
Expand All @@ -80,7 +79,7 @@ def downloadSongs(self, songs_json, album_name='songs', artist_name='Non-Artist'
print("Error : {0}".format(e))
print('\n')
except Exception as e:
logger.error('Download Error : {0}'.format(e))
print('Download Error : {0}'.format(e))

def addtags(self, filename, json_data, playlist_name):
audio = MP4(filename)
Expand Down

0 comments on commit 5ac81ae

Please sign in to comment.