fnp
/
audio.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
l10n
[audio.git]
/
src
/
archive
/
views.py
diff --git
a/src/archive/views.py
b/src/archive/views.py
index
aee88e6
..
f1b1c1b
100644
(file)
--- a/
src/archive/views.py
+++ b/
src/archive/views.py
@@
-11,6
+11,7
@@
from django.http import Http404, HttpResponse
from django.shortcuts import render, redirect, get_object_or_404
from django.utils.translation import gettext as _
from django.views.decorators.http import require_POST
from django.shortcuts import render, redirect, get_object_or_404
from django.utils.translation import gettext as _
from django.views.decorators.http import require_POST
+from django.views.generic import ListView
import mutagen
import mutagen
@@
-22,8
+23,6
@@
from archive.utils import all_files
def list_new(request):
def list_new(request):
- division = 'new'
-
path = settings.NEW_PATH
objects = sorted(all_files(path))
return render(request, "archive/list_new.html", locals())
path = settings.NEW_PATH
objects = sorted(all_files(path))
return render(request, "archive/list_new.html", locals())
@@
-31,8
+30,6
@@
def list_new(request):
@permission_required('archive.change_audiobook')
def file_new(request, filename):
@permission_required('archive.change_audiobook')
def file_new(request, filename):
- division = 'new'
-
filepath = filename
root_filepath = os.path.join(settings.NEW_PATH, filename)
if request.POST:
filepath = filename
root_filepath = os.path.join(settings.NEW_PATH, filename)
if request.POST:
@@
-185,6
+182,7
@@
def cancel_publishing(request, aid):
audiobook.mp3_status = None
audiobook.ogg_status = None
audiobook.youtube_status = None
audiobook.mp3_status = None
audiobook.ogg_status = None
audiobook.youtube_status = None
+ audiobook.youtube_queued = None
audiobook.save()
return redirect(file_managed, aid)
audiobook.save()
return redirect(file_managed, aid)
@@
-210,17
+208,10
@@
def download(request, aid, which="source"):
return response
return response
-def list_unpublished(request):
- division = 'unpublished'
-
- objects = models.Audiobook.objects.filter(Q(mp3_published=None) | Q(ogg_published=None))
- return render(request, "archive/list_unpublished.html", locals())
-
-
def list_publishing(request):
def list_publishing(request):
- division = 'publishing'
-
-
objects = models.Audiobook.objects.exclude(mp3_status=None, ogg_status=None, youtube_status=None
)
+ objects = models.Audiobook.objects.exclude(
+ mp3_status=None, ogg_status=None, youtube_status=None
+
).order_by("youtube_queued", "title"
)
objects_by_status = {}
for o in objects:
statuses = set()
objects_by_status = {}
for o in objects:
statuses = set()
@@
-237,11
+228,8
@@
def list_publishing(request):
return render(request, "archive/list_publishing.html", locals())
return render(request, "archive/list_publishing.html", locals())
-def list_published(request):
- division = 'published'
-
- objects = models.Audiobook.objects.exclude(Q(mp3_published=None) | Q(ogg_published=None))
- return render(request, "archive/list_published.html", locals())
+class AudiobookList(ListView):
+ queryset = models.Audiobook.objects.all()
@permission_required('archive.change_audiobook')
@permission_required('archive.change_audiobook')
@@
-256,7
+244,6
@@
def file_managed(request, id):
except IOError:
raise Http404
except IOError:
raise Http404
- division = 'published' if audiobook.published() else 'unpublished'
path = audiobook.source_file.path[len(settings.FILES_PATH):].lstrip('/')
# for tags update
path = audiobook.source_file.path[len(settings.FILES_PATH):].lstrip('/')
# for tags update
@@
-270,32
+257,35
@@
def file_managed(request, id):
request.user.oauthconnection_set.filter(access=True).exists())
alerts = []
request.user.oauthconnection_set.filter(access=True).exists())
alerts = []
- series = models.Audiobook.objects.filter(url=audiobook.url)
- real = series.count()
- if real != audiobook.parts_count:
- alerts.append(_('Parts number inconsitent. Declared number: %(declared)d. Real number: %(real)d') % {"declared": audiobook.parts_count, "real": real})
- if audiobook.parts_count > 1:
+ parts_count = audiobook.parts_count
+ if parts_count > 1:
+ series = models.Audiobook.objects.filter(slug=audiobook.slug)
if not audiobook.index:
alerts.append(_('There is more than one part, but index is not set.'))
if not audiobook.index:
alerts.append(_('There is more than one part, but index is not set.'))
- if set(series.values_list('index', flat=True)) != set(range(1,
audiobook.
parts_count + 1)):
- alerts.append(_('Part indexes are not 1..%(parts_count)d.') % {"parts_count":
audiobook.
parts_count})
+ if set(series.values_list('index', flat=True)) != set(range(1, parts_count + 1)):
+ alerts.append(_('Part indexes are not 1..%(parts_count)d.') % {"parts_count": parts_count})
return render(request, "archive/file_managed.html", locals())
def list_unmanaged(request):
return render(request, "archive/file_managed.html", locals())
def list_unmanaged(request):
- division = 'unmanaged'
-
objects = sorted(all_files(settings.UNMANAGED_PATH))
return render(request, "archive/list_unmanaged.html", locals())
def file_unmanaged(request, filename):
objects = sorted(all_files(settings.UNMANAGED_PATH))
return render(request, "archive/list_unmanaged.html", locals())
def file_unmanaged(request, filename):
- division = 'unmanaged'
-
tags = mutagen.File(os.path.join(settings.UNMANAGED_PATH, filename.encode('utf-8')))
if not tags:
tags = {}
err_exists = request.GET.get('exists')
return render(request, "archive/file_unmanaged.html", locals())
tags = mutagen.File(os.path.join(settings.UNMANAGED_PATH, filename.encode('utf-8')))
if not tags:
tags = {}
err_exists = request.GET.get('exists')
return render(request, "archive/file_unmanaged.html", locals())
+
+
+class BookView(ListView):
+ template_name = 'archive/book.html'
+
+ def get_queryset(self):
+ return models.Audiobook.objects.filter(slug=self.kwargs["slug"]).order_by(
+ "index"
+ )