From 49088db0ea250c3d7bc2632c0b0a7f9aefde604e Mon Sep 17 00:00:00 2001
From: Dmitry Shelepnev <mitshel@mail.ru>
Date: Wed, 1 Feb 2017 12:31:42 +0300
Subject: [PATCH] Fix hardcoded fb2 download in enclosure
opds_catalog.CatalogsFeed
---
opds_catalog/feeds.py | 4 ++--
postgres-note.txt | 20 ++++++++++++++++++++
2 files changed, 22 insertions(+), 2 deletions(-)
create mode 100644 postgres-note.txt
diff --git a/opds_catalog/feeds.py b/opds_catalog/feeds.py
index 7d900e4..b85767b 100644
--- a/opds_catalog/feeds.py
+++ b/opds_catalog/feeds.py
@@ -294,8 +294,8 @@ class CatalogsFeed(AuthFeed):
return (opdsEnclosure(reverse("opds_catalog:cat_tree", kwargs={"cat_id":item['id']}),"application/atom+xml;profile=opds-catalog;kind=navigation", "subsection"),)
else:
return (
- opdsEnclosure(reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip_flag":0}),"application/fb2" ,"http://opds-spec.org/acquisition/open-access"),
- opdsEnclosure(reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip_flag":1}),"application/fb2+zip", "http://opds-spec.org/acquisition/open-access"),
+ opdsEnclosure(reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip_flag":0}),"application/%s"%item['format'] ,"http://opds-spec.org/acquisition/open-access"),
+ opdsEnclosure(reverse("opds_catalog:download", kwargs={"book_id":item['id'],"zip_flag":1}),"application/%s+zip"%item['format'], "http://opds-spec.org/acquisition/open-access"),
opdsEnclosure(reverse("opds_catalog:cover", kwargs={"book_id":item['id']}),"image/jpeg", "http://opds-spec.org/image"),
opdsEnclosure(reverse("opds_catalog:thumb", kwargs={"book_id": item['id']}), "image/jpeg","http://opds-spec.org/thumbnail"),
)
diff --git a/postgres-note.txt b/postgres-note.txt
new file mode 100644
index 0000000..aa14077
--- /dev/null
+++ b/postgres-note.txt
@@ -0,0 +1,20 @@
+locale -a
+sudo locale-gen ru_RU.UTF-8
+locale -a
+
+������ ���������:
+select name, setting from pg_settings where name like '%_encoding';
+select name, setting from pg_settings where name like 'lc_%';
+
+������� �� � ������ ���������:
+create database sopds2
+with owner sopds
+ENCODING 'UTF8'
+LC_COLLATE = 'ru_RU.UTF-8'
+LC_CTYPE = 'ru_RU.UTF-8';
+
+create database sopds2
+with owner sopds
+ENCODING 'UTF8'
+LC_COLLATE = '�'
+LC_CTYPE = '�';
\ No newline at end of file
--
GitLab