Merge branch 'master' into clear_id3_tags

console.py → helper/console.py

@@ -1,7 +1,7 @@
 import sys
 
 import colorama as color
-from settings import Settings
+from helper.settings import Settings
 
 OUTPUT = 0
 DBG_ERROR = 1

sites/helper/download.py → helper/sites/download.py

@@ -1,9 +1,9 @@
-import console
-import sites.helper.tagging as tagging
-from sites.helper.item import Empty
+from helper import console
+import helper.tagging as tagging
+from helper.sites.item import Empty
 from .request import RawRequest
 from pyquery import PyQuery
-from settings import Settings
+from helper.settings import Settings
 
 import math
 import urllib.parse
@@ -36,7 +36,7 @@ def download(item, type='GET', parameters=None, headers=None, cookies=None, stre
         console.output('Assuming it\'s a mp3 file', console.DBG_INFO)
         name = name + '.mp3'
 
-    full_name = '{0}/{1}'.format(Settings.tmpDir, name)
+    full_name = os.path.abspath('{0}/{1}'.format(Settings.tmpDir, name))
 
     if item.bitrate is Empty and item.bytes is None:
         size = file.headers.get('content-length')
@@ -85,7 +85,9 @@ def savefileprogress(name, full_name, file, item):
 
         tagging.write_tags_to_file(full_name, item)
 
-    full_save_name = '{0}/{1}'.format(Settings.SaveDir, name)
+        name = urllib.parse.unquote('{x.artist} - {x.title}'.format(x=tags)) + '.mp3'
+
+    full_save_name = os.path.abspath('{0}/{1}'.format(Settings.SaveDir, name))
     os.rename(full_name, full_save_name)
     console.output('Moved to {0}'.format(full_save_name), level=console.DBG_INFO)
 

sites/helper/item.py → helper/sites/item.py

@@ -1,4 +1,4 @@
-import console
+from helper import console
 import re
 
 

sites/helper/request.py → helper/sites/request.py

@@ -1,7 +1,7 @@
 import requests
 import urllib.parse
 
-import console
+from helper import console
 
 
 class Request:

sites/helper/structure.py → helper/sites/structure.py

@@ -1,6 +1,6 @@
 from pyquery import PyQuery
 
-from sites.helper.item import Item, Empty
+from helper.sites.item import Item
 
 
 class Structure:

sites/helper/tagging.py → helper/tagging.py

@@ -1,9 +1,9 @@
-import console
-from mutagen.id3 import ID3, ID3NoHeaderError
-from mutagen.id3 import ID3, TIT2, TALB, TPE1, TPE2, COMM, TCOM, TCON, TDRC, APIC
+from helper import console
+from mutagen.id3 import ID3NoHeaderError
+from mutagen.id3 import ID3, TIT2, TALB, TPE1, COMM, TCON, APIC
 
-from sites.helper.request import RawRequest
-from sites.tags import available
+from helper.sites.request import RawRequest
+from tags import available
 
 
 def search_tags(item):

sites/tags/structure.py → helper/tags/structure.py

@@ -1,7 +1,7 @@
-from sites.helper.structure import Structure
+from helper.sites.structure import Structure
 from pyquery import PyQuery
 
-from sites.tags.tagitem import TagItem
+from helper.tags.tagitem import TagItem
 
 
 class TagStructure(Structure):

main.py

@@ -1,7 +1,7 @@
 import sites as sites
-import console as console
+from helper import console as console
 import os.path
-from settings import Settings
+from helper.settings import Settings
 
 
 def init():
@@ -14,7 +14,9 @@ def init():
 
     Settings.tmpDir = os.path.expanduser(os.getenv('MD_TMP', '/tmp'))
 
-    directory(os.getenv('MD_SAVEDIR', '~/Music/iTunes/iTunes Media/Automatically Add to iTunes'))
+    os.makedirs(Settings.tmpDir, exist_ok=True)
+
+    directory(os.getenv('MD_SAVEDIR', '~/Downloads'))
 
     quality(os.getenv('MD_QUALITY', '300'))
 
@@ -43,9 +45,9 @@ def main():
 def choose_site():
     global selected_site
     _index = console.option_picker('Available sites',
-                                          list(map(lambda x: x.url, sites.available)),
-                                          selected_site,
-                                          True)
+                                   list(map(lambda x: x.url, sites.available)),
+                                   selected_site,
+                                   True)
     if _index is not None:
         selected_site = _index
     return True
@@ -129,6 +131,7 @@ def directory(dir=None):
     if dir is None:
         dir = console.ask_input('Enter new save directory')
     Settings.SaveDir = os.path.expanduser(dir)
+    os.makedirs(Settings.SaveDir, exist_ok=True)
     console.output('New save directory: {0}'.format(Settings.SaveDir), level=console.DBG_INFO)
     return True
 

sites/czne.py

@@ -1,5 +1,5 @@
 from sites.default import DefaultSite
-from sites.helper.query import Query
+from helper.sites.query import Query
 
 
 class Czne(DefaultSite):

sites/default.py

@@ -1,10 +1,8 @@
-import console
-from sites.helper.request import Request
-from sites.helper.query import Query
-from sites.helper.structure import Structure
-from sites.helper.item import Empty
-
-import sites.helper.download as Download
+from helper.sites import download
+from helper.sites.request import Request
+from helper.sites.query import Query
+from helper.sites.structure import Structure
+from helper.sites.item import Empty
 
 
 class DefaultSite:
@@ -52,8 +50,8 @@ class DefaultSite:
         # item.original_url = item.site.format_url(item.original_url)
 
         if 'zippyshare' in item.original_url:
-            Download.zippyaudio(item)
+            download.zippyaudio(item)
         elif 'krakenfiles' in item.original_url:
-            Download.krakenfiles(item)
+            download.krakenfiles(item)
         else:
-            Download.download(item)
+            download.download(item)

sites/lalamus.py

@@ -1,5 +1,5 @@
 from sites.default import DefaultSite
-from sites.helper.query import Query
+from helper.sites.query import Query
 
 
 class Lalamus(DefaultSite):

sites/musicid.py

@@ -1,5 +1,5 @@
 from sites.default import DefaultSite
-from sites.helper.query import Query
+from helper.sites.query import Query
 import requests
 
 # TODO - Make compatible, add artist path

sites/musicteam.py

@@ -1,5 +1,5 @@
 from sites.default import DefaultSite
-from sites.helper.query import Query
+from helper.sites.query import Query
 import requests
 
 

sites/uzimusic.py

@@ -1,5 +1,5 @@
 from sites.default import DefaultSite
-from sites.helper.query import Query
+from helper.sites.query import Query
 
 
 class Uzimusic(DefaultSite):

sites/tags/beatport.py → tags/beatport.py

@@ -1,5 +1,5 @@
-from sites.tags.default import DefaultTagSite
-from sites.helper.query import Query
+from tags.default import DefaultTagSite
+from helper.sites.query import Query
 from pyquery import PyQuery
 
 

sites/tags/default.py → tags/default.py

@@ -1,6 +1,6 @@
-from sites.tags.structure import TagStructure
-from sites.helper.request import Request
-from sites.helper.query import Query
+from helper.tags.structure import TagStructure
+from helper.sites.request import Request
+from helper.sites.query import Query
 
 
 class DefaultTagSite: