+# -*- coding: utf-8 -*-
from datetime import date
from functools import wraps
from os.path import join
-from os import listdir, stat
+from os import listdir
from shutil import move, rmtree
from django.conf import settings
import re
import filecmp
-from django.db.models import Count
-
def active_tab(tab):
"""
@property
def was_merged(self):
- "Check if we have gallery size recorded"
+ """Check if we have gallery size recorded"""
return self.dest_size is not None
def merge(self):
for f in files:
p = self.get_prefix(f)
if p:
- if p > last_pfx: last_pfx = p
+ if p > last_pfx:
+ last_pfx = p
else:
files_prefixed = False
break
for f in files_other:
pfx = self.get_prefix(f)
if pfx is not None:
- if not pfx in prefixes:
+ if pfx not in prefixes:
last_pfx += 1
prefixes[pfx] = last_pfx
renamed_files_other[f] = self.set_prefix(f, prefixes[pfx])
# finally, move / rename files.
for frm, to in renamed_files.items():
- move(join(self.path(self.dest), frm),
- join(self.path(self.dest), to))
+ move(join(self.path(self.dest), frm), join(self.path(self.dest), to))
for frm, to in renamed_files_other.items():
- move(join(self.path(self.src), frm),
- join(self.path(self.dest), to))
+ move(join(self.path(self.src), frm), join(self.path(self.dest), to))
rmtree(join(self.path(self.src)))
return self.dest
# -*- coding: utf-8 -*-
-from datetime import datetime, date, timedelta
+from datetime import date, timedelta
import logging
import os
-from StringIO import StringIO
from urllib import unquote
from urlparse import urlsplit, urlunsplit
from django.contrib.auth.models import User
from django.contrib.auth.decorators import login_required, permission_required
from django.core.urlresolvers import reverse
-from django.db.models import Count, Q
+from django.db.models import Count
from django.db import transaction
from django import http
from django.http import Http404, HttpResponse, HttpResponseForbidden
from catalogue import forms
from catalogue import helpers
from catalogue.helpers import active_tab
-from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord, Project
+from catalogue.models import Book, Chunk, Project
from fileupload.views import UploadView, PackageView
#
@never_cache
def my(request):
return render(request, 'catalogue/my_page.html', {
- 'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
- key=lambda x: x[1]['time'], reverse=True),
-
- "logout_to": '/',
- })
+ 'last_books': sorted(
+ request.session.get("wiki_last_books", {}).items(),
+ key=lambda x: x[1]['time'], reverse=True),
+ 'logout_to': '/',
+ })
@active_tab('users')
if request.method == "POST":
form = forms.DocumentsUploadForm(request.POST, request.FILES)
if form.is_valid():
- import slughifi
+ from slughifi import slughifi
if request.user.is_authenticated():
creator = request.user
error_list.append((filename, slug, _('Slug already used in repository.')))
else:
try:
- zip.read(filename).decode('utf-8') # test read
+ zip.read(filename).decode('utf-8') # test read
ok_list.append((filename, slug, title))
except UnicodeDecodeError:
error_list.append((filename, title, _('File should be UTF-8 encoded.')))
# book_themes = book_themes.items()
# book_themes.sort(key=lambda s: s[0].sort_key)
- return render_to_response('catalogue/book_text.html', locals(),
+ return render_to_response(
+ 'catalogue/book_text.html', locals(),
context_instance=RequestContext(request))
# TODO: error handling
pdf_file = doc.as_pdf()
from catalogue.ebook_utils import serve_file
- return serve_file(pdf_file.get_filename(),
- book.slug + '.pdf', 'application/pdf')
+ return serve_file(pdf_file.get_filename(), book.slug + '.pdf', 'application/pdf')
@never_cache
creator = request.user
else:
creator = None
- doc.split(creator=creator,
+ doc.split(
+ creator=creator,
slug=form.cleaned_data['slug'],
title=form.cleaned_data['title'],
gallery_start=form.cleaned_data['gallery_start'],
@login_required
def chunk_mass_edit(request):
if request.method == 'POST':
- ids = map(int, filter(lambda i: i.strip()!='', request.POST.get('ids').split(',')))
+ ids = map(int, filter(lambda i: i.strip() != '', request.POST.get('ids').split(',')))
chunks = map(lambda i: Chunk.objects.get(id=i), ids)
stage = request.POST.get('stage')
if stage:
try:
stage = Chunk.tag_model.objects.get(slug=stage)
- except Chunk.DoesNotExist, e:
+ except Chunk.DoesNotExist:
stage = None
- for c in chunks: c.stage = stage
+ for c in chunks:
+ c.stage = stage
username = request.POST.get('user')
logger.info("username: %s" % username)
except User.DoesNotExist, e:
user = None
- for c in chunks: c.user = user
+ for c in chunks:
+ c.user = user
status = request.POST.get('status')
if status:
book.project = project
book.save()
- for c in chunks: c.save()
+ for c in chunks:
+ c.save()
return HttpResponse("", content_type="text/plain")
else:
class GalleryMixin(object):
def get_directory(self):
return "%s%s/" % (settings.IMAGE_DIR, self.object.gallery)
- def get_object(self, request, slug):
+
+ @staticmethod
+ def get_object(request, slug):
book = get_object_or_404(Book, slug=slug)
if not book.gallery:
raise Http404
return book
+
class GalleryView(GalleryMixin, UploadView):
def breadcrumbs(self):
class GalleryPackageView(GalleryMixin, PackageView):
def get_redirect_url(self, slug):
- return reverse('catalogue_book_gallery', kwargs = dict(slug=slug))
+ return reverse('catalogue_book_gallery', kwargs={'slug': slug})
fnp / redakcja.git / commitdiff