Remove unused fields, add more project settings.

[audio.git] / src / archive / views.py

diff --git a/src/archive/views.py b/src/archive/views.py
index 87eee5b..4865203 100644 (file)
--- a/src/archive/views.py
+++ b/src/archive/views.py
@@ -157,9 +157,7 @@ def move_to_new(request, filename):
 def publish(request, aid, publish=True):
     """ mark file for publishing """
     audiobook = get_object_or_404(models.Audiobook, id=aid)
-    audiobook.prepare_for_publish()
-    if publish:
-        audiobook.publish(request.user)
+    audiobook.publish(request.user, publish=publish)
     return redirect(file_managed, aid)
 
 
@@ -292,11 +290,17 @@ class BookView(ListView):
             "index"
         )
         last_vol = None
+        last_vol_sub = None
         for b in qs:
-            if last_vol is None or last_vol.youtube_volume != b.youtube_volume:
+            if last_vol is None or last_vol.youtube_volume_index != b.youtube_volume_index:
                 last_vol = b
                 b.total = 0
+                if last_vol_sub is None or b.youtube_volume:
+                    last_vol_sub = last_vol
+                    last_vol_sub.total_for_sub = 0
             last_vol.total += b.duration
+            last_vol_sub.total_for_sub += b.duration
+            b.subtotal = last_vol_sub.total_for_sub
         return list(qs)