Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
douban-api-proxy
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
captainwong
douban-api-proxy
Commits
7e19e1dd
Commit
7e19e1dd
authored
Feb 22, 2017
by
OzzieIsaacs
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added Publisher and search/advanced search/opds search for publisher
parent
6ec4e0a6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
58 additions
and
21 deletions
+58
-21
db.py
cps/db.py
+20
-0
detail.html
cps/templates/detail.html
+8
-1
search_form.html
cps/templates/search_form.html
+16
-12
web.py
cps/web.py
+14
-8
No files found.
cps/db.py
View file @
7e19e1dd
...
@@ -56,6 +56,10 @@ books_languages_link = Table('books_languages_link', Base.metadata,
...
@@ -56,6 +56,10 @@ books_languages_link = Table('books_languages_link', Base.metadata,
Column
(
'lang_code'
,
Integer
,
ForeignKey
(
'languages.id'
),
primary_key
=
True
)
Column
(
'lang_code'
,
Integer
,
ForeignKey
(
'languages.id'
),
primary_key
=
True
)
)
)
books_publishers_link
=
Table
(
'books_publishers_link'
,
Base
.
metadata
,
Column
(
'book'
,
Integer
,
ForeignKey
(
'books.id'
),
primary_key
=
True
),
Column
(
'publisher'
,
Integer
,
ForeignKey
(
'publishers.id'
),
primary_key
=
True
)
)
class
Identifiers
(
Base
):
class
Identifiers
(
Base
):
__tablename__
=
'identifiers'
__tablename__
=
'identifiers'
...
@@ -182,6 +186,21 @@ class Languages(Base):
...
@@ -182,6 +186,21 @@ class Languages(Base):
def
__repr__
(
self
):
def
__repr__
(
self
):
return
u"<Languages('{0}')>"
.
format
(
self
.
lang_code
)
return
u"<Languages('{0}')>"
.
format
(
self
.
lang_code
)
class
Publishers
(
Base
):
__tablename__
=
'publishers'
id
=
Column
(
Integer
,
primary_key
=
True
)
name
=
Column
(
String
)
sort
=
Column
(
String
)
def
__init__
(
self
,
name
,
sort
):
self
.
name
=
name
self
.
sort
=
sort
def
__repr__
(
self
):
return
u"<Publishers('{0},{1}')>"
.
format
(
self
.
name
,
self
.
sort
)
class
Data
(
Base
):
class
Data
(
Base
):
__tablename__
=
'data'
__tablename__
=
'data'
...
@@ -224,6 +243,7 @@ class Books(Base):
...
@@ -224,6 +243,7 @@ class Books(Base):
series
=
relationship
(
'Series'
,
secondary
=
books_series_link
,
backref
=
'books'
)
series
=
relationship
(
'Series'
,
secondary
=
books_series_link
,
backref
=
'books'
)
ratings
=
relationship
(
'Ratings'
,
secondary
=
books_ratings_link
,
backref
=
'books'
)
ratings
=
relationship
(
'Ratings'
,
secondary
=
books_ratings_link
,
backref
=
'books'
)
languages
=
relationship
(
'Languages'
,
secondary
=
books_languages_link
,
backref
=
'books'
)
languages
=
relationship
(
'Languages'
,
secondary
=
books_languages_link
,
backref
=
'books'
)
publishers
=
relationship
(
'Publishers'
,
secondary
=
books_publishers_link
,
backref
=
'books'
)
identifiers
=
relationship
(
'Identifiers'
,
backref
=
'books'
)
identifiers
=
relationship
(
'Identifiers'
,
backref
=
'books'
)
def
__init__
(
self
,
title
,
sort
,
author_sort
,
timestamp
,
pubdate
,
series_index
,
last_modified
,
path
,
has_cover
,
def
__init__
(
self
,
title
,
sort
,
author_sort
,
timestamp
,
pubdate
,
series_index
,
last_modified
,
path
,
has_cover
,
...
...
cps/templates/detail.html
View file @
7e19e1dd
...
@@ -50,6 +50,7 @@
...
@@ -50,6 +50,7 @@
{% if entry.identifiers|length > 0 %}
{% if entry.identifiers|length > 0 %}
<div
class=
"identifiers"
>
<div
class=
"identifiers"
>
<p>
<span
class=
"glyphicon glyphicon-link"
></span>
<span
class=
"glyphicon glyphicon-link"
></span>
{% for identifier in entry.identifiers %}
{% for identifier in entry.identifiers %}
<a
href=
"{{identifier}}"
target=
"_blank"
class=
"btn btn-xs btn-success"
role=
"button"
>
{{identifier.formatType()}}
</a>
<a
href=
"{{identifier}}"
target=
"_blank"
class=
"btn btn-xs btn-success"
role=
"button"
>
{{identifier.formatType()}}
</a>
...
@@ -66,10 +67,16 @@
...
@@ -66,10 +67,16 @@
{% for tag in entry.tags %}
{% for tag in entry.tags %}
<a
href=
"{{ url_for('category', id=tag.id) }}"
class=
"btn btn-xs btn-info"
role=
"button"
>
{{tag.name}}
</a>
<a
href=
"{{ url_for('category', id=tag.id) }}"
class=
"btn btn-xs btn-info"
role=
"button"
>
{{tag.name}}
</a>
{%endfor%}
{%endfor%}
</div>
</div>
</p>
</p>
{% endif %}
{% endif %}
{% if entry.publishers|length > 0 %}
<div
class=
"publishers"
>
<p>
<span>
{{_('Publisher')}}:{% for publisher in entry.publishers %} {{publisher.name}}{% if not loop.last %},{% endif %}{% endfor %}
</span>
</p>
</div>
{% endif %}
{% if entry.pubdate[:10] != '0101-01-01' %}
{% if entry.pubdate[:10] != '0101-01-01' %}
<p>
{{_('Publishing date')}}: {{entry.pubdate|formatdate}}
</p>
<p>
{{_('Publishing date')}}: {{entry.pubdate|formatdate}}
</p>
{% endif %}
{% endif %}
...
...
cps/templates/search_form.html
View file @
7e19e1dd
...
@@ -10,63 +10,67 @@
...
@@ -10,63 +10,67 @@
<label
for=
"bookAuthor"
>
{{_('Author')}}
</label>
<label
for=
"bookAuthor"
>
{{_('Author')}}
</label>
<input
type=
"text"
class=
"form-control typeahead"
name=
"author_name"
id=
"bookAuthor"
value=
""
autocomplete=
"off"
>
<input
type=
"text"
class=
"form-control typeahead"
name=
"author_name"
id=
"bookAuthor"
value=
""
autocomplete=
"off"
>
</div>
</div>
<label
for=
"Tags"
>
{{_('Tags')}}
</label>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<label
for=
"Publisher"
>
{{_('Publisher')}}
</label>
<input
type=
"text"
class=
"form-control"
name=
"publisher"
id=
"publisher"
value=
""
>
</div>
<label
for=
"include_tag"
>
{{_('Tags')}}
</label>
<div
class=
"form-group"
id=
"test"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
{% for tag in tags %}
{% for tag in tags %}
<label
id=
"tag_{{tag.id}}"
class=
"btn btn-primary tags_click"
>
<label
id=
"tag_{{tag.id}}"
class=
"btn btn-primary tags_click"
>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"include_tag"
value=
"{{tag.id}}"
>
{{tag.name}}
</input>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"include_tag"
id=
"include_tag"
value=
"{{tag.id}}"
>
{{tag.name}}
</input>
</label>
</label>
{% endfor %}
{% endfor %}
</div>
</div>
</div>
</div>
<label
for=
"
Tags
"
>
{{_('Exclude Tags')}}
</label>
<label
for=
"
exclude_tag
"
>
{{_('Exclude Tags')}}
</label>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
{% for tag in tags %}
{% for tag in tags %}
<label
id=
"tag_{{tag.id}}"
class=
"btn btn-danger tags_click"
>
<label
id=
"tag_{{tag.id}}"
class=
"btn btn-danger tags_click"
>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"exclude_tag"
value=
"{{tag.id}}"
>
{{tag.name}}
</input>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"exclude_tag"
id=
"exclude_tag"
value=
"{{tag.id}}"
>
{{tag.name}}
</input>
</label>
</label>
{% endfor %}
{% endfor %}
</div>
</div>
</div>
</div>
<label
for=
"
Series
"
>
{{_('Series')}}
</label>
<label
for=
"
include_serie
"
>
{{_('Series')}}
</label>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
{% for serie in series %}
{% for serie in series %}
<label
id=
"serie_{{serie.id}}"
class=
"btn btn-primary serie_click"
>
<label
id=
"serie_{{serie.id}}"
class=
"btn btn-primary serie_click"
>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"include_serie"
value=
"{{serie.id}}"
>
{{serie.name}}
</input>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"include_serie"
id=
"include_serie"
value=
"{{serie.id}}"
>
{{serie.name}}
</input>
</label>
</label>
{% endfor %}
{% endfor %}
</div>
</div>
</div>
</div>
<label
for=
"
Series
"
>
{{_('Exclude Series')}}
</label>
<label
for=
"
exclude_serie
"
>
{{_('Exclude Series')}}
</label>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
{% for serie in series %}
{% for serie in series %}
<label
id=
"serie_{{serie.id}}"
class=
"btn btn-danger serie_click"
>
<label
id=
"serie_{{serie.id}}"
class=
"btn btn-danger serie_click"
>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"exclude_serie"
value=
"{{serie.id}}"
>
{{serie.name}}
</input>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"exclude_serie"
id=
"exclude_serie"
value=
"{{serie.id}}"
>
{{serie.name}}
</input>
</label>
</label>
{% endfor %}
{% endfor %}
</div>
</div>
</div>
</div>
{% if languages %}
{% if languages %}
<label
for=
"
Languages
"
>
{{_('Languages')}}
</label>
<label
for=
"
include_language
"
>
{{_('Languages')}}
</label>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
{% for language in languages %}
{% for language in languages %}
<label
id=
"language_{{language.id}}"
class=
"btn btn-primary serie_click"
>
<label
id=
"language_{{language.id}}"
class=
"btn btn-primary serie_click"
>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"include_language"
value=
"{{language.id}}"
>
{{language.name}}
</input>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"include_language"
id=
"include_language"
value=
"{{language.id}}"
>
{{language.name}}
</input>
</label>
</label>
{% endfor %}
{% endfor %}
</div>
</div>
</div>
</div>
<label
for=
"
Languages
"
>
{{_('Exclude Languages')}}
</label>
<label
for=
"
exclude_language
"
>
{{_('Exclude Languages')}}
</label>
<div
class=
"form-group"
>
<div
class=
"form-group"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
<div
class=
"btn-toolbar btn-toolbar-lg"
data-toggle=
"buttons"
>
{% for language in languages %}
{% for language in languages %}
<label
id=
"language_{{language.id}}"
class=
"btn btn-danger language_click"
>
<label
id=
"language_{{language.id}}"
class=
"btn btn-danger language_click"
>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"exclude_language"
value=
"{{language.id}}"
>
{{language.name}}
</input>
<input
type=
"checkbox"
autocomplete=
"off"
name=
"exclude_language"
id=
"exclude_language"
value=
"{{language.id}}"
>
{{language.name}}
</input>
</label>
</label>
{% endfor %}
{% endfor %}
</div>
</div>
...
...
cps/web.py
View file @
7e19e1dd
...
@@ -473,8 +473,10 @@ def feed_search(term):
...
@@ -473,8 +473,10 @@ def feed_search(term):
filter
=
True
filter
=
True
if
term
:
if
term
:
entries
=
db
.
session
.
query
(
db
.
Books
)
.
filter
(
db
.
or_
(
db
.
Books
.
tags
.
any
(
db
.
Tags
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
entries
=
db
.
session
.
query
(
db
.
Books
)
.
filter
(
db
.
or_
(
db
.
Books
.
tags
.
any
(
db
.
Tags
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
authors
.
any
(
db
.
Authors
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
series
.
any
(
db
.
Series
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
title
.
like
(
"
%
"
+
term
+
"
%
"
)))
.
filter
(
filter
)
.
all
()
db
.
Books
.
authors
.
any
(
db
.
Authors
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
publishers
.
any
(
db
.
Publishers
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
title
.
like
(
"
%
"
+
term
+
"
%
"
)))
.
filter
(
filter
)
.
all
()
entriescount
=
len
(
entries
)
if
len
(
entries
)
>
0
else
1
entriescount
=
len
(
entries
)
if
len
(
entries
)
>
0
else
1
pagination
=
Pagination
(
1
,
entriescount
,
entriescount
)
pagination
=
Pagination
(
1
,
entriescount
,
entriescount
)
xml
=
render_title_template
(
'feed.xml'
,
searchterm
=
term
,
entries
=
entries
,
pagination
=
pagination
)
xml
=
render_title_template
(
'feed.xml'
,
searchterm
=
term
,
entries
=
entries
,
pagination
=
pagination
)
...
@@ -1087,9 +1089,10 @@ def search():
...
@@ -1087,9 +1089,10 @@ def search():
else
:
else
:
filter
=
True
filter
=
True
entries
=
db
.
session
.
query
(
db
.
Books
)
.
filter
(
db
.
or_
(
db
.
Books
.
tags
.
any
(
db
.
Tags
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
entries
=
db
.
session
.
query
(
db
.
Books
)
.
filter
(
db
.
or_
(
db
.
Books
.
tags
.
any
(
db
.
Tags
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
series
.
any
(
db
.
Series
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
series
.
any
(
db
.
Series
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
authors
.
any
(
db
.
Authors
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
authors
.
any
(
db
.
Authors
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
title
.
like
(
"
%
"
+
term
+
"
%
"
)))
.
filter
(
filter
)
.
all
()
db
.
Books
.
publishers
.
any
(
db
.
Publishers
.
name
.
like
(
"
%
"
+
term
+
"
%
"
)),
db
.
Books
.
title
.
like
(
"
%
"
+
term
+
"
%
"
)))
.
filter
(
filter
)
.
all
()
return
render_title_template
(
'search.html'
,
searchterm
=
term
,
entries
=
entries
)
return
render_title_template
(
'search.html'
,
searchterm
=
term
,
entries
=
entries
)
else
:
else
:
return
render_title_template
(
'search.html'
,
searchterm
=
""
)
return
render_title_template
(
'search.html'
,
searchterm
=
""
)
...
@@ -1109,12 +1112,14 @@ def advanced_search():
...
@@ -1109,12 +1112,14 @@ def advanced_search():
author_name
=
request
.
args
.
get
(
"author_name"
)
author_name
=
request
.
args
.
get
(
"author_name"
)
book_title
=
request
.
args
.
get
(
"book_title"
)
book_title
=
request
.
args
.
get
(
"book_title"
)
publisher
=
request
.
args
.
get
(
"publisher"
)
if
author_name
:
author_name
=
author_name
.
strip
()
if
author_name
:
author_name
=
author_name
.
strip
()
if
book_title
:
book_title
=
book_title
.
strip
()
if
book_title
:
book_title
=
book_title
.
strip
()
if
publisher
:
publisher
=
publisher
.
strip
()
if
include_tag_inputs
or
exclude_tag_inputs
or
include_series_inputs
or
exclude_series_inputs
or
\
if
include_tag_inputs
or
exclude_tag_inputs
or
include_series_inputs
or
exclude_series_inputs
or
\
include_languages_inputs
or
exclude_languages_inputs
or
author_name
or
book_title
:
include_languages_inputs
or
exclude_languages_inputs
or
author_name
or
book_title
or
publisher
:
searchterm
=
[]
searchterm
=
[]
searchterm
.
extend
((
author_name
,
book_title
))
searchterm
.
extend
((
author_name
,
book_title
,
publisher
))
tag_names
=
db
.
session
.
query
(
db
.
Tags
)
.
filter
(
db
.
Tags
.
id
.
in_
(
include_tag_inputs
))
.
all
()
tag_names
=
db
.
session
.
query
(
db
.
Tags
)
.
filter
(
db
.
Tags
.
id
.
in_
(
include_tag_inputs
))
.
all
()
searchterm
.
extend
(
tag
.
name
for
tag
in
tag_names
)
searchterm
.
extend
(
tag
.
name
for
tag
in
tag_names
)
# searchterm = " + ".join(filter(None, searchterm))
# searchterm = " + ".join(filter(None, searchterm))
...
@@ -1130,7 +1135,8 @@ def advanced_search():
...
@@ -1130,7 +1135,8 @@ def advanced_search():
searchterm
.
extend
(
language
.
name
for
language
in
language_names
)
searchterm
.
extend
(
language
.
name
for
language
in
language_names
)
searchterm
=
" + "
.
join
(
filter
(
None
,
searchterm
))
searchterm
=
" + "
.
join
(
filter
(
None
,
searchterm
))
q
=
q
.
filter
(
db
.
Books
.
authors
.
any
(
db
.
Authors
.
name
.
like
(
"
%
"
+
author_name
+
"
%
"
)),
q
=
q
.
filter
(
db
.
Books
.
authors
.
any
(
db
.
Authors
.
name
.
like
(
"
%
"
+
author_name
+
"
%
"
)),
db
.
Books
.
title
.
like
(
"
%
"
+
book_title
+
"
%
"
))
db
.
Books
.
title
.
like
(
"
%
"
+
book_title
+
"
%
"
),
db
.
Books
.
publishers
.
any
(
db
.
Publishers
.
name
.
like
(
"
%
"
+
publisher
+
"
%
"
)))
for
tag
in
include_tag_inputs
:
for
tag
in
include_tag_inputs
:
q
=
q
.
filter
(
db
.
Books
.
tags
.
any
(
db
.
Tags
.
id
==
tag
))
q
=
q
.
filter
(
db
.
Books
.
tags
.
any
(
db
.
Tags
.
id
==
tag
))
for
tag
in
exclude_tag_inputs
:
for
tag
in
exclude_tag_inputs
:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment