From f508cfc59b779520f1cc057049bbe8caa9a6a04d Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Wed, 20 Apr 2016 22:13:42 +0200 Subject: [PATCH] fix watchmedo patterns, cleanup --- app/scripts/app.sh | 3 ++- app/worker.py | 2 +- app/wsgi.py | 11 ++--------- telemeta/models/item.py | 1 + 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/scripts/app.sh b/app/scripts/app.sh index 747a5c47..46d4b3a4 100644 --- a/app/scripts/app.sh +++ b/app/scripts/app.sh @@ -15,6 +15,7 @@ threads=8 autoreload=3 uid='www-data' gid='www-data' +patterns='*.js;*.css;*.jpg;*.jpeg;*.gif;*.png;*.svg;*.ttf;*.eot;*.woff;*.woff2' # stating apps # pip install django-bootstrap3==6.2.1 @@ -45,7 +46,7 @@ if [ $1 = "--runserver" ]; then python $manage runserver_plus 0.0.0.0:8000 else # static files auto update - watchmedo shell-command --patterns="*.js;*.css" --recursive \ + watchmedo shell-command --patterns="$patterns" --recursive \ --command='python '$manage' collectstatic --noinput' $src & # app start diff --git a/app/worker.py b/app/worker.py index 7e52b6d2..6d06656d 100644 --- a/app/worker.py +++ b/app/worker.py @@ -17,7 +17,7 @@ app.config_from_object('django.conf:settings') app.autodiscover_tasks(lambda: settings.INSTALLED_APPS) # app.conf.update( # CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend', -# ) +# ) @app.task(bind=True) def debug_task(self): diff --git a/app/wsgi.py b/app/wsgi.py index a16968d4..5eacdab9 100644 --- a/app/wsgi.py +++ b/app/wsgi.py @@ -1,17 +1,10 @@ -#!/usr/bin/python2.5 +#!/usr/bin/python # -*- coding: utf-8 -*- import os import sys +from django.core.wsgi import get_wsgi_application sys.path.append(os.path.dirname('.')) - -# os.environ['DJANGO_SETTINGS_MODULE'] = 'settings' -# -# import django.core.handlers.wsgi -# application = django.core.handlers.wsgi.WSGIHandler() - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") - -from django.core.wsgi import get_wsgi_application application = get_wsgi_application() diff --git a/telemeta/models/item.py b/telemeta/models/item.py index 3345dcee..5111261b 100644 --- a/telemeta/models/item.py +++ b/telemeta/models/item.py @@ -191,6 +191,7 @@ class MediaItem(MediaResource): def get_source(self): source = None + source_type = None if self.file and os.path.exists(self.file.path): source = self.file.path elif self.url: -- 2.39.5