Use base url in some hardcoded URLs

This commit is contained in:
Alex Ling 2020-05-23 13:15:01 +00:00
parent 8fe2f3b4cc
commit eefa8c3982

View File

@ -24,6 +24,8 @@ class ReaderRouter < Router
get "/reader/:title/:entry/:page" do |env| get "/reader/:title/:entry/:page" do |env|
begin begin
base_url = Config.current.base_url
title = (@context.library.get_title env.params.url["title"]).not_nil! title = (@context.library.get_title env.params.url["title"]).not_nil!
entry = (title.get_entry env.params.url["entry"]).not_nil! entry = (title.get_entry env.params.url["entry"]).not_nil!
page = env.params.url["page"].to_i page = env.params.url["page"].to_i
@ -35,23 +37,22 @@ class ReaderRouter < Router
pages = (page...[entry.pages + 1, page + IMGS_PER_PAGE].min) pages = (page...[entry.pages + 1, page + IMGS_PER_PAGE].min)
urls = pages.map { |idx| urls = pages.map { |idx|
"/api/page/#{title.id}/#{entry.id}/#{idx}" "#{base_url}api/page/#{title.id}/#{entry.id}/#{idx}"
} }
reader_urls = pages.map { |idx| reader_urls = pages.map { |idx|
"/reader/#{title.id}/#{entry.id}/#{idx}" "#{base_url}reader/#{title.id}/#{entry.id}/#{idx}"
} }
next_page = page + IMGS_PER_PAGE next_page = page + IMGS_PER_PAGE
next_url = next_entry_url = nil next_url = next_entry_url = nil
exit_url = "/book/#{title.id}" exit_url = "#{base_url}book/#{title.id}"
next_entry = title.next_entry entry next_entry = title.next_entry entry
unless next_page > entry.pages unless next_page > entry.pages
next_url = "/reader/#{title.id}/#{entry.id}/#{next_page}" next_url = "#{base_url}reader/#{title.id}/#{entry.id}/#{next_page}"
end end
unless next_entry.nil? unless next_entry.nil?
next_entry_url = "/reader/#{title.id}/#{next_entry.id}" next_entry_url = "#{base_url}reader/#{title.id}/#{next_entry.id}"
end end
base_url = Config.current.base_url
render "src/views/reader.ecr" render "src/views/reader.ecr"
rescue e rescue e
@context.error e @context.error e