refactor: you_get.__main__ -> you_get.downloader.__main__

src/you_get/__init__.py

@@ -1,9 +1,9 @@
 #!/usr/bin/env python
 
-from .processor import *
-
-from .downloader import *
-
-from .version import *
 from .common import *
-from .__main__ import *
+from .version import *
+
+# Easy import
+#from .cli_wrapper.converter import *
+#from .cli_wrapper.player import *
+from .downloader import *

src/you_get/downloader/__init__.py

@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 
+from .__main__ import *
 from .acfun import *
 from .alive import *
 from .baidu import *

src/you_get/downloader/__main__.py

@@ -1,9 +1,8 @@
 #!/usr/bin/env python
-
 __all__ = ['main', 'any_download', 'any_download_playlist']
 
-from .downloader import *
+from ..downloader import *
-from .common import *
+from ..common import *
 
 def url_to_module(url):
     site = r1(r'http://([^/]+)/', url)

src/you_get/version.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-
 __all__ = ['__version__', '__date__']
 
-__version__ = '0.3.18'
+__version__ = '0.4.0dev'
-__date__ = '2013-07-19'
+__date__ = '2013-07-26'

you-get

@@ -1,9 +1,10 @@
 #!/usr/bin/env python3
 
 import os, sys
-sys.path.insert(0, os.path.join((os.path.dirname(os.path.realpath(__file__))), "src"))
+__path__ = os.path.dirname(os.path.realpath(__file__))
+__srcdir__ = 'src'
+sys.path.insert(1, os.path.join(__path__, __srcdir__))
+from you_get.downloader import main
 
-from you_get import *
+if __name__ == '__main__':
-
-if __name__ == "__main__":
     main()

you-get.json

@@ -31,6 +31,6 @@
         ],
     
     "console_scripts": [
-        "you-get = you_get.__main__:main"
+        "you-get = you_get.downloader.__main__:main"
         ]
 }