diff --git a/INSTALL b/INSTALL index 5fc4c36..622d081 100644 --- a/INSTALL +++ b/INSTALL @@ -1,6 +1,6 @@ #curl -u hb_client_2862_1:j2CbCM8H -H 'Accept: application/json' -H 'Content-type: application/json' http://c1.lon2.dediserve.com/virtual_machines.xml -apt-get install git python-virtualenv postgresql postgresql-client postgresql-client-common postgresql-dev-all rabbitmq-server libsndfile1-dev libpng++-dev libpng12-dev libboost-program-options-dev libjpeg-dev python-dev +apt-get install git python-virtualenv postgresql-common libsndfile1-dev libpng++-dev libpng12-dev libboost-program-options-dev libjpeg-dev python-dev virtualenv env source env/bin/activate diff --git a/requirements.txt b/requirements.txt index abc7b42..480d136 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ Django==1.6.1 -PIL>=1.1.7 +#PIL>=1.1.7 #install PIL manually south beautifulsoup4>=4.1.1 decorator>=3.3.3 django-allauth>=0.7.0 django-annoying>=0.7.6 -django-celery>=3.0.4 +django-celery django-gravatar2>=1.0.6 django-socialauth>=0.1.2c django-tastypie>=0.9.11 @@ -19,9 +19,11 @@ git+git://github.com/hpoul/sct-communitytools.git#django-sct git+git://github.com/jefftriplett/django-podcast.git#django-podcast git+git://github.com/etianen/django-require.git#django-require git+git://github.com/spookylukey/django-paypal.git#django-paypal +git+git://github.com/llazzaro/django-scheduler.git#django-scheduler django-templated-email django-grappelli humanize +mandrill django-debug-toolbar sorl-thumbnail django_extensions diff --git a/spa/audio.py b/spa/audio.py index f0b9ba3..f84799e 100755 --- a/spa/audio.py +++ b/spa/audio.py @@ -40,7 +40,7 @@ def download(request, mix_id): response = HttpResponse(FileWrapper(open(audio_file)), content_type=mimetypes.guess_type(audio_file)[0]) response['Content-Length'] = os.path.getsize(audio_file) - response['Content-Disposition'] = "attachment; filename=Deep South Sounds - %s%s" % ( + response['Content-Disposition'] = "attachment; filename=\"Deep South Sounds - %s%s\"" % ( mix.title, extension) return response else: @@ -49,7 +49,7 @@ def download(request, mix_id): except Exception, ex: print ex - return Http404("Mix not found") + raise Http404("Mix not found") def start_streaming(request, mix_id): diff --git a/spa/models/show.py b/spa/models/show.py index 576f90c..1650cec 100644 --- a/spa/models/show.py +++ b/spa/models/show.py @@ -13,6 +13,7 @@ class Show(Event): """ throw an exception if event overlaps with another event """ + import ipdb; ipdb.set_trace() overlaps = Show.objects.filter( Q(start__gte=self.start, end__lte=self.start) | Q(start__gte=self.end, end__lte=self.end) @@ -20,4 +21,4 @@ class Show(Event): if len(overlaps) != 0: raise ShowOverlapException() - return super(Show, self).save(force_insert, force_update, using, update_fields) \ No newline at end of file + return super(Show, self).save(force_insert, force_update, using, update_fields)