X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/9c5d9a4e77a10b4e60d89d3890e49002bd7f3993..f1b96a4ab6d12606f18a580b8609182d60f119c6:/apps/catalogue/views.py?ds=sidebyside diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 47abe637d..e7df9bc5d 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -45,16 +45,27 @@ class LazyEncoder(simplejson.JSONEncoder): return force_unicode(obj) return obj +# shortcut for JSON reponses +class JSONResponse(HttpResponse): + def __init__(self, data={}, callback=None, **kwargs): + # get rid of mimetype + kwargs.pop('mimetype', None) + data = simplejson.dumps(data) + if callback: + data = callback + "(" + data + ");" + super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs) + def main_page(request): if request.user.is_authenticated(): shelves = models.Tag.objects.filter(category='set', user=request.user) new_set_form = forms.NewSetForm() - extra_where = "NOT catalogue_tag.category = 'set'" - tags = models.Tag.objects.usage_for_model(models.Book, counts=True, extra={'where': [extra_where]}) - fragment_tags = models.Tag.objects.usage_for_model(models.Fragment, counts=True, - extra={'where': ["catalogue_tag.category = 'theme'"] + [extra_where]}) + + tags = models.Tag.objects.exclude(category__in=('set', 'book')) + for tag in tags: + tag.count = tag.get_count() categories = split_tags(tags) + fragment_tags = categories.get('theme', []) form = forms.SearchForm() return render_to_response('catalogue/main_page.html', locals(), @@ -105,8 +116,9 @@ def tagged_object_list(request, tags=''): raise Http404 theme_is_set = [tag for tag in tags if tag.category == 'theme'] - shelf_is_set = len(tags) == 1 and tags[0].category == 'set' - my_shelf_is_set = shelf_is_set and request.user.is_authenticated() and request.user == tags[0].user + shelf_is_set = [tag for tag in tags if tag.category == 'set'] + only_shelf = shelf_is_set and len(tags) == 1 + only_my_shelf = only_shelf and request.user.is_authenticated() and request.user == tags[0].user objects = only_author = pd_counter = None categories = {} @@ -118,7 +130,7 @@ def tagged_object_list(request, tags=''): if shelf_tags: books = models.Book.tagged.with_all(shelf_tags).order_by() - l_tags = [book.book_tag() for book in books] + l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books]) fragments = models.Fragment.tagged.with_any(l_tags, fragments) # newtagging goes crazy if we just try: @@ -136,11 +148,12 @@ def tagged_object_list(request, tags=''): else: # get relevant books and their tags objects = models.Book.tagged.with_all(tags).order_by() - l_tags = [book.book_tag() for book in objects] - # eliminate descendants - descendants_keys = [book.pk for book in models.Book.tagged.with_any(l_tags)] - if descendants_keys: - objects = objects.exclude(pk__in=descendants_keys) + if not shelf_is_set: + # eliminate descendants + l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in objects]) + descendants_keys = [book.pk for book in models.Book.tagged.with_any(l_tags)] + if descendants_keys: + objects = objects.exclude(pk__in=descendants_keys) # get related tags from `tag_counter` and `theme_counter` related_counts = {} @@ -169,10 +182,10 @@ def tagged_object_list(request, tags=''): template_name='catalogue/tagged_object_list.html', extra_context={ 'categories': categories, - 'shelf_is_set': shelf_is_set, + 'only_shelf': only_shelf, 'only_author': only_author, 'pd_counter': pd_counter, - 'user_is_owner': my_shelf_is_set, + 'only_my_shelf': only_my_shelf, 'formats_form': forms.DownloadFormatsForm(), 'tags': tags, @@ -201,8 +214,12 @@ def book_detail(request, slug): tags = list(book.tags.filter(~Q(category='set'))) categories = split_tags(tags) book_children = book.children.all().order_by('parent_number') - extra_where = "catalogue_tag.category = 'theme'" - book_themes = models.Tag.objects.related_for_model(book_tag, models.Fragment, counts=True, extra={'where': [extra_where]}) + + theme_counter = book.theme_counter + book_themes = models.Tag.objects.filter(pk__in=theme_counter.keys()) + for tag in book_themes: + tag.count = theme_counter[tag.pk] + extra_info = book.get_extra_info_value() form = forms.SearchForm() @@ -297,7 +314,6 @@ def _tags_starting_with(prefix, user=None): tags = tags.filter(~Q(category='book') & (~Q(category='set') | Q(user=user))) else: tags = tags.filter(~Q(category='book') & ~Q(category='set')) - return list(books) + list(tags) + list(book_stubs) @@ -314,7 +330,7 @@ def _get_result_type(match): type = 'book' else: type = match.category - return dict(models.TAG_CATEGORIES)[type] + return type @@ -372,8 +388,29 @@ def tags_starting_with(request): # Prefix must have at least 2 characters if len(prefix) < 2: return HttpResponse('') - - return HttpResponse('\n'.join(tag.name for tag in _tags_starting_with(prefix, request.user))) + tags_list = [] + result = "" + for tag in _tags_starting_with(prefix, request.user): + if not tag.name in tags_list: + result += "\n" + tag.name + tags_list.append(tag.name) + return HttpResponse(result) + +def json_tags_starting_with(request, callback=None): + # Callback for JSONP + prefix = request.GET.get('q', '') + callback = request.GET.get('callback', '') + # Prefix must have at least 2 characters + if len(prefix) < 2: + return HttpResponse('') + tags_list = [] + result = "" + for tag in _tags_starting_with(prefix, request.user): + if not tag.name in tags_list: + result += "\n" + tag.name + tags_list.append(tag.name) + dict_result = {"matches": tags_list} + return JSONResponse(dict_result, callback) # ==================== # = Shelf management = @@ -402,11 +439,11 @@ def book_sets(request, slug): new_shelves = [models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']] for shelf in [shelf for shelf in old_shelves if shelf not in new_shelves]: - shelf.book_count -= 1 + shelf.book_count = None shelf.save() for shelf in [shelf for shelf in new_shelves if shelf not in old_shelves]: - shelf.book_count += 1 + shelf.book_count = None shelf.save() book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user))) @@ -432,7 +469,7 @@ def remove_from_shelf(request, shelf, book): if shelf in book.tags: models.Tag.objects.remove_tag(book, shelf) - shelf.book_count -= 1 + shelf.book_count = None shelf.save() return HttpResponse(_('Book was successfully removed from the shelf')) @@ -612,7 +649,6 @@ def import_book(request): info = sys.exc_info() exception = pprint.pformat(info[1]) tb = '\n'.join(traceback.format_tb(info[2])) - _('Today is %(month)s, %(day)s.') % {'month': m, 'day': d} return HttpResponse(_("An error occurred: %(exception)s\n\n%(tb)s") % {'exception':exception, 'tb':tb}, mimetype='text/plain') return HttpResponse(_("Book imported successfully")) else: