fnp
/
wolnelektury.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More tolerance for bad url metadata.
[wolnelektury.git]
/
apps
/
catalogue
/
templatetags
/
catalogue_tags.py
diff --git
a/apps/catalogue/templatetags/catalogue_tags.py
b/apps/catalogue/templatetags/catalogue_tags.py
index
0800865
..
fd8c8c4
100644
(file)
--- a/
apps/catalogue/templatetags/catalogue_tags.py
+++ b/
apps/catalogue/templatetags/catalogue_tags.py
@@
-5,6
+5,7
@@
import datetime
import feedparser
from random import randint
import datetime
import feedparser
from random import randint
+from urlparse import urlparse
from django.conf import settings
from django import template
from django.conf import settings
from django import template
@@
-14,9
+15,9
@@
from django.core.urlresolvers import reverse
from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django.utils.translation import ugettext as _
from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
from django.utils.translation import ugettext as _
-from catalogue.utils import
split_tags,
related_tag_name as _related_tag_name
-from catalogue.models import Book, BookMedia, Fragment, Tag
-from catalogue.constants import LICENSES
, LANGUAGES_3TO2
+from catalogue.utils import related_tag_name as _related_tag_name
+from catalogue.models import Book, BookMedia, Fragment, Tag
, Source
+from catalogue.constants import LICENSES
register = template.Library()
register = template.Library()
@@
-55,7
+56,7
@@
def html_title_from_tags(tags):
template = Template("{{ category }}: <a href='{{ tag.get_absolute_url }}'>{{ tag.name }}</a>")
return capfirst(",<br/>".join(
template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags))
template = Template("{{ category }}: <a href='{{ tag.get_absolute_url }}'>{{ tag.name }}</a>")
return capfirst(",<br/>".join(
template.render(Context({'tag': tag, 'category': _(tag.category)})) for tag in tags))
-
+
def simple_title(tags):
title = []
def simple_title(tags):
title = []
@@
-186,12
+187,12
@@
def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
return '"%s"' % s
except ValueError:
return s
return '"%s"' % s
except ValueError:
return s
-
+
return "".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
%(children)s""" % {
"d": delimeter,
"preindent": delimeter * (depth - 1),
return "".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
%(children)s""" % {
"d": delimeter,
"preindent": delimeter * (depth - 1),
- "postindent": delimeter * (max_depth - depth),
+ "postindent": delimeter * (max_depth - depth),
"depth": depth,
"author": quote_if_necessary(author.name),
"title": quote_if_necessary(book.title),
"depth": depth,
"author": quote_if_necessary(author.name),
"title": quote_if_necessary(book.title),
@@
-284,8
+285,8
@@
def latest_blog_posts(feed_url, posts_to_show=5):
feed = feedparser.parse(str(feed_url))
posts = []
for i in range(posts_to_show):
feed = feedparser.parse(str(feed_url))
posts = []
for i in range(posts_to_show):
- pub_date = feed['entries'][i].
updat
ed_parsed
- published = datetime.date(pub_date[0], pub_date[1], pub_date[2]
)
+ pub_date = feed['entries'][i].
publish
ed_parsed
+ published = datetime.date(pub_date[0], pub_date[1], pub_date[2])
posts.append({
'title': feed['entries'][i].title,
'summary': feed['entries'][i].summary,
posts.append({
'title': feed['entries'][i].title,
'summary': feed['entries'][i].summary,
@@
-326,6
+327,7
@@
def book_wide(context, book):
book_themes = book.related_themes()
extra_info = book.extra_info
hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
book_themes = book.related_themes()
extra_info = book.extra_info
hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
+ stage_note, stage_note_url = book.stage_note()
return {
'book': book,
return {
'book': book,
@@
-336,17
+338,23
@@
def book_wide(context, book):
'themes': book_themes,
'request': context.get('request'),
'show_lang': book.language_code() != settings.LANGUAGE_CODE,
'themes': book_themes,
'request': context.get('request'),
'show_lang': book.language_code() != settings.LANGUAGE_CODE,
+ 'stage_note': stage_note,
+ 'stage_note_url': stage_note_url,
}
@register.inclusion_tag('catalogue/book_short.html', takes_context=True)
def book_short(context, book):
}
@register.inclusion_tag('catalogue/book_short.html', takes_context=True)
def book_short(context, book):
+ stage_note, stage_note_url = book.stage_note()
+
return {
'book': book,
'main_link': book.get_absolute_url(),
'related': book.related_info(),
'request': context.get('request'),
'show_lang': book.language_code() != settings.LANGUAGE_CODE,
return {
'book': book,
'main_link': book.get_absolute_url(),
'related': book.related_info(),
'request': context.get('request'),
'show_lang': book.language_code() != settings.LANGUAGE_CODE,
+ 'stage_note': stage_note,
+ 'stage_note_url': stage_note_url,
}
}
@@
-365,9
+373,6
@@
def book_mini(book, with_link=True):
@register.inclusion_tag('catalogue/work-list.html', takes_context=True)
def work_list(context, object_list):
request = context.get('request')
@register.inclusion_tag('catalogue/work-list.html', takes_context=True)
def work_list(context, object_list):
request = context.get('request')
- for obj in object_list:
- obj.object_type = type(object_list[0]).__name__
-
return locals()
return locals()
@@
-418,7
+423,7
@@
def catalogue_menu():
('genre', _('Genres'), 'gatunki'),
('kind', _('Kinds'), 'rodzaje'),
('epoch', _('Epochs'), 'epoki'),
('genre', _('Genres'), 'gatunki'),
('kind', _('Kinds'), 'rodzaje'),
('epoch', _('Epochs'), 'epoki'),
- ('theme', _('Themes'), '
autorz
y'),
+ ('theme', _('Themes'), '
motyw
y'),
]}
]}
@@
-472,7
+477,18
@@
def related_tag_name(tag, lang=None):
return _related_tag_name(tag, lang)
return _related_tag_name(tag, lang)
-@register.
simple_tag
+@register.
filter
def class_name(obj):
return obj.__class__.__name__
def class_name(obj):
return obj.__class__.__name__
+
+@register.simple_tag
+def source_name(url):
+ url = url.lstrip()
+ netloc = urlparse(url).netloc
+ if not netloc:
+ netloc = urlparse('http://' + url).netloc
+ if not netloc:
+ return ''
+ source, created = Source.objects.get_or_create(netloc=netloc)
+ return source.name or netloc