Merge branch 'master' into v0.2.0

src/routes/api.cr

@@ -3,19 +3,20 @@ require "../mangadex/*"
 
 class APIRouter < Router
 	def setup
-		get "/api/page/:title/:entry/:page" do |env|
+		get "/api/page/:tid/:eid/:page" do |env|
 			begin
-				title = env.params.url["title"]
-				entry = env.params.url["entry"]
+				tid = env.params.url["tid"]
+				eid = env.params.url["eid"]
 				page = env.params.url["page"].to_i
 
-				t = @context.library.get_title title
-				raise "Title `#{title}` not found" if t.nil?
-				e = t.get_entry entry
-				raise "Entry `#{entry}` of `#{title}` not found" if e.nil?
-				img = e.read_page page
-				raise "Failed to load page #{page} of `#{title}/#{entry}`"\
-					if img.nil?
+				title = @context.library.get_title tid
+				raise "Title ID `#{tid}` not found" if title.nil?
+				entry = title.get_entry eid
+				raise "Entry ID `#{eid}` of `#{title.title}` not found" if \
+					entry.nil?
+				img = entry.read_page page
+				raise "Failed to load page #{page} of " \
+					"`#{title.title}/#{entry.title}`" if img.nil?
 
 				send_img env, img
 			rescue e
@@ -27,12 +28,11 @@ class APIRouter < Router
 
 		get "/api/book/:title" do |env|
 			begin
-				title = env.params.url["title"]
+				tid = env.params.url["tid"]
+				title = @context.library.get_title tid
+				raise "Title ID `#{tid}` not found" if title.nil?
 
-				t = @context.library.get_title title
-				raise "Title `#{title}` not found" if t.nil?
-
-				send_json env, t.to_json
+				send_json env, title.to_json
 			rescue e
 				@context.error e
 				env.response.status_code = 500

src/routes/reader.cr

@@ -16,7 +16,7 @@ class ReaderRouter < Router
 				# 	might not have actually read them
 				page = [page - 2 * IMGS_PER_PAGE, 1].max
 
-				env.redirect "/reader/#{title.title}/#{entry.title}/#{page}"
+				env.redirect "/reader/#{title.id}/#{entry.id}/#{page}"
 			rescue e
 				@context.error e
 				env.response.status_code = 404
@@ -37,16 +37,16 @@ class ReaderRouter < Router
 
 				pages = (page...[entry.pages + 1, page + IMGS_PER_PAGE].min)
 				urls = pages.map { |idx|
-					"/api/page/#{title.title}/#{entry.title}/#{idx}" }
+					"/api/page/#{title.id}/#{entry.id}/#{idx}" }
 				reader_urls = pages.map { |idx|
-					"/reader/#{title.title}/#{entry.title}/#{idx}" }
+					"/reader/#{title.id}/#{entry.id}/#{idx}" }
 				next_page = page + IMGS_PER_PAGE
 				next_url = next_page > entry.pages ? nil :
-					"/reader/#{title.title}/#{entry.title}/#{next_page}"
-				exit_url = "/book/#{title.title}"
+					"/reader/#{title.id}/#{entry.id}/#{next_page}"
+				exit_url = "/book/#{title.id}"
 				next_entry = title.next_entry entry
 				next_entry_url = next_entry.nil? ? nil : \
-					"/reader/#{title.title}/#{next_entry.title}"
+					"/reader/#{title.id}/#{next_entry.id}"
 
 				render "src/views/reader.ecr"
 			rescue e