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
86127746
Commit
86127746
authored
Sep 28, 2021
by
Ozzie Isaacs
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'origin/master'
parents
2e25e797
58735caf
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
11 deletions
+18
-11
db.py
cps/db.py
+10
-5
web.py
cps/web.py
+8
-6
No files found.
cps/db.py
View file @
86127746
...
@@ -805,11 +805,16 @@ class CalibreDB():
...
@@ -805,11 +805,16 @@ class CalibreDB():
.
filter
(
self
.
common_filters
())
\
.
filter
(
self
.
common_filters
())
\
.
group_by
(
text
(
'books_languages_link.lang_code'
))
.
all
()
.
group_by
(
text
(
'books_languages_link.lang_code'
))
.
all
()
for
lang
in
languages
:
for
lang
in
languages
:
try
:
lang
.
name
=
isoLanguages
.
get_language_name
(
get_locale
(),
lang
.
lang_code
)
cur_l
=
LC
.
parse
(
lang
.
lang_code
)
#try:
lang
.
name
=
cur_l
.
get_language_name
(
get_locale
())
# if lang.lang_code.lower() == "und":
except
UnknownLocaleError
:
# lang.name = isoLanguages.get_language_name(get_locale(), lang.lang_code)
lang
.
name
=
_
(
isoLanguages
.
get
(
part3
=
lang
.
lang_code
)
.
name
)
# # lang.name = _("Undetermined")
# else:
# cur_l = LC.parse(lang.lang_code)
# lang.name = cur_l.get_language_name(get_locale())
#except UnknownLocaleError:
# lang.name = _(isoLanguages.get(part3=lang.lang_code).name)
return
languages
return
languages
def
update_title_sort
(
self
,
config
,
conn
=
None
):
def
update_title_sort
(
self
,
config
,
conn
=
None
):
...
...
cps/web.py
View file @
86127746
...
@@ -1748,12 +1748,14 @@ def show_book(book_id):
...
@@ -1748,12 +1748,14 @@ def show_book(book_id):
entries
=
calibre_db
.
get_filtered_book
(
book_id
,
allow_show_archived
=
True
)
entries
=
calibre_db
.
get_filtered_book
(
book_id
,
allow_show_archived
=
True
)
if
entries
:
if
entries
:
for
index
in
range
(
0
,
len
(
entries
.
languages
)):
for
index
in
range
(
0
,
len
(
entries
.
languages
)):
try
:
entries
.
languages
[
index
]
.
language_name
=
isoLanguages
.
get_language_name
(
get_locale
(),
entries
.
languages
[
entries
.
languages
[
index
]
.
language_name
=
LC
.
parse
(
entries
.
languages
[
index
]
.
lang_code
)
\
index
]
.
lang_code
)
.
get_language_name
(
get_locale
())
#try:
except
UnknownLocaleError
:
# entries.languages[index].language_name = isoLanguages.get_language_name(get_locale(), LC.parse(entries.languages[index].lang_code)
entries
.
languages
[
index
]
.
language_name
=
_
(
# .get_language_name(get_locale())
isoLanguages
.
get
(
part3
=
entries
.
languages
[
index
]
.
lang_code
)
.
name
)
#except UnknownLocaleError:
# entries.languages[index].language_name = _(
# isoLanguages.get(part3=entries.languages[index].lang_code).name)
cc
=
get_cc_columns
(
filter_config_custom_read
=
True
)
cc
=
get_cc_columns
(
filter_config_custom_read
=
True
)
book_in_shelfs
=
[]
book_in_shelfs
=
[]
shelfs
=
ub
.
session
.
query
(
ub
.
BookShelf
)
.
filter
(
ub
.
BookShelf
.
book_id
==
book_id
)
.
all
()
shelfs
=
ub
.
session
.
query
(
ub
.
BookShelf
)
.
filter
(
ub
.
BookShelf
.
book_id
==
book_id
)
.
all
()
...
...
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