Pull plz

.gitignore

@@ -2,3 +2,4 @@
 *.sqlite
 music_server/local_settings.py
 music_server/media/*
+!music_server/media/.gitignore

music_server/local_settings.py.tmpl

@@ -40,3 +40,8 @@ SECRET_KEY = '-chk7s=vwhvnwx-fq39j!v6ed6qs)&%z+iz0m-i3n9-75nxyin'
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
 MEDIA_ROOT = 'media'
+
+# Path to youtube-dl's location. By default, this assumes that it is accessible
+# via the user's PATH.
+# Example: "/usr/bin/youtube-dl"
+YOUTUBE_DL = 'youtube-dl'

music_server/management/commands/youtube.py

@@ -21,9 +21,9 @@
 
 class Command(BaseCommand):
     option_list = BaseCommand.option_list + (
-        make_option('--verbosity', action='store', dest='verbosity', default='1',
-            type='choice', choices=['0', '1', '2'],
-            help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
+        #make_option('--verbosity', action='store', dest='verbosity', default='1',
+        #    type='choice', choices=['0', '1', '2'],
+        #    help='Verbosity level; 0=minimal output, 1=normal output, 2=all output'),
         #make_option('--daemonise', action='store_true', dest='daemonise', default=False,
         #    help='Daemonise'),
     )
@@ -56,7 +56,7 @@ def handle(self, *app_labels, **options):
 
             tempdir = tempfile.mkdtemp('music-server-youtube')
             try:
-                cmd = ['/home/music-server/youtube-dl','--max-quality=22']
+                cmd = [settings.YOUTUBE_DL,'--max-quality=22']
                 if verbosity < 2:
                     cmd.append('--quiet')
                 cmd.extend(['--title', item.uri])

music_server/urls.py

@@ -28,6 +28,7 @@
         {'template': 'registration/password_changed.html'}, name='password_change_success'),
 
     url(r'^a/admin/(.*)', admin.site.root),
+    url(r'^uploaded/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT, 'show_indexes': True}),
 )
 
 if settings.DEBUG: