Restructure code

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

@@ -1,6 +1,6 @@
 import console
-import sites.helper.tagging as tagging
-from sites.helper.item import Empty
+import helper.tagging as tagging
+from helper.sites.item import Empty
 from .request import RawRequest
 from pyquery import PyQuery
 from settings import Settings

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 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):

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: