Backups/Mango
1
0
Fork 0
mirror of https://github.com/hkalexling/Mango.git synced 2025-08-02 19:05:32 -04:00
Code Issues Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Alex Ling 2020-06-08 15:29:05 +00:00
parent 0f3dd51d6b
commit 926d0e66a5
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/library.cr
View File

@ -384,7 +384,8 @@ class Title
# TODO: More concise title? # TODO: More concise title?
def get_last_read_for_continue_reading(username, entry_obj) def get_last_read_for_continue_reading(username, entry_obj)
last_read = load_last_read username, entry_obj.title last_read = load_last_read username, entry_obj.title
if last_read.nil? # grab from previous entry if current entry hasn't been started yet # grab from previous entry if current entry hasn't been started yet
if last_read.nil?
previous_entry = previous_entry(entry_obj) previous_entry = previous_entry(entry_obj)
return load_last_read username, previous_entry.title if previous_entry return load_last_read username, previous_entry.title if previous_entry
end end
@ -517,9 +518,9 @@ class Library
continue_reading = continue_reading_entries.map { |e| continue_reading = continue_reading_entries.map { |e|
{ {
entry: e, entry: e,
percentage: e.book.load_percentage(username, e.title), percentage: e.book.load_percentage(username, e.title),
last_read: get_relevant_last_read(username, e) last_read: get_relevant_last_read(username, e),
} }
} }
@ -532,7 +533,10 @@ class Library
}[0..11] }[0..11]
end end
alias RA = NamedTuple(entry: Entry, percentage: Float64, grouped_count: Int32) alias RA = NamedTuple(
entry: Entry,
percentage: Float64,
grouped_count: Int32)
def get_recently_added_entries(username) def get_recently_added_entries(username)
entries = [] of Entry entries = [] of Entry
@ -563,7 +567,7 @@ class Library
recently_added[0..11] recently_added[0..11]
end end
private def get_continue_reading_entry(username, title) private def get_continue_reading_entry(username, title)
in_progress_entries = title.entries.select do |e| in_progress_entries = title.entries.select do |e|
title.load_progress(username, e.title) > 0 title.load_progress(username, e.title) > 0
@ -572,7 +576,7 @@ class Library
latest_read_entry = in_progress_entries[-1] latest_read_entry = in_progress_entries[-1]
if title.load_progress(username, latest_read_entry.title) == if title.load_progress(username, latest_read_entry.title) ==
latest_read_entry.pages latest_read_entry.pages
title.next_entry latest_read_entry title.next_entry latest_read_entry
else else
latest_read_entry latest_read_entry
@ -581,9 +585,11 @@ class Library
private def get_relevant_last_read(username, entry_obj) private def get_relevant_last_read(username, entry_obj)
last_read = entry_obj.book.load_last_read username, entry_obj.title last_read = entry_obj.book.load_last_read username, entry_obj.title
if last_read.nil? # grab from previous entry if current entry hasn't been started yet # grab from previous entry if current entry hasn't been started yet
if last_read.nil?
previous_entry = entry_obj.book.previous_entry(entry_obj) previous_entry = entry_obj.book.previous_entry(entry_obj)
return entry_obj.book.load_last_read username, previous_entry.title if previous_entry return entry_obj.book.load_last_read username, previous_entry.title \
if previous_entry
end end
last_read last_read
end end

5
src/routes/main.cr
View File

@ -71,10 +71,11 @@ class MainRouter < Router
get "/" do |env| get "/" do |env|
begin begin
username = get_username env username = get_username env
continue_reading = @context.library.get_continue_reading_entries username continue_reading = @context
.library.get_continue_reading_entries username
recently_added = @context.library.get_recently_added_entries username recently_added = @context.library.get_recently_added_entries username
titles = @context.library.titles titles = @context.library.titles
new_user = ! titles.any? { |t| t.load_percentage(username) > 0 } new_user = !titles.any? { |t| t.load_percentage(username) > 0 }
empty_library = titles.size == 0 empty_library = titles.size == 0
layout "home" layout "home"
rescue e rescue e