Move relevant methods from Title to Entry

This commit is contained in:
Alex Ling
2020-06-13 15:54:55 +00:00
parent c8be2849b9
commit 9302601307
4 changed files with 76 additions and 94 deletions

View File

@@ -80,7 +80,7 @@ class APIRouter < Router
if !entry_id.nil?
entry = title.get_entry(entry_id).not_nil!
raise "incorrect page value" if page < 0 || page > entry.pages
title.save_progress username, entry.title, page
entry.save_progress username, page
elsif page == 0
title.unread_all username
else

View File

@@ -53,9 +53,7 @@ class MainRouter < Router
begin
title = (@context.library.get_title env.params.url["title"]).not_nil!
username = get_username env
percentage = title.entries.map { |e|
title.load_percentage username, e.title
}
percentage = title.entries.map &.load_percentage username
title_percentage = title.titles.map &.load_percentage username
layout "title"
rescue e

View File

@@ -9,7 +9,7 @@ class ReaderRouter < Router
# load progress
username = get_username env
page = title.load_progress username, entry.title
page = entry.load_progress username
# we go back 2 * `IMGS_PER_PAGE` pages. the infinite scroll
# library perloads a few pages in advance, and the user
# might not have actually read them
@@ -33,7 +33,7 @@ class ReaderRouter < Router
# save progress
username = get_username env
title.save_progress username, entry.title, page
entry.save_progress username, page
pages = (page...[entry.pages + 1, page + IMGS_PER_PAGE].min)
urls = pages.map { |idx|
@@ -45,7 +45,7 @@ class ReaderRouter < Router
next_page = page + IMGS_PER_PAGE
next_url = next_entry_url = nil
exit_url = "#{base_url}book/#{title.id}"
next_entry = title.next_entry entry
next_entry = entry.next_entry
unless next_page > entry.pages
next_url = "#{base_url}reader/#{title.id}/#{entry.id}/#{next_page}"
end