Backups/Mango
1
0
Fork 0
mirror of https://github.com/hkalexling/Mango.git synced 2026-04-05 00:00:44 -04:00
Code Issues Projects Releases Wiki Activity

Fix #6

Browse Source
This commit is contained in:
Alex Ling
2020-02-23 18:35:27 +00:00
parent 5b34c05243
commit 650ebc7f9d
8 changed files with 92 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/library.cr
View File

@@ -1,6 +1,7 @@
require "zip"
require "mime"
require "json"
require "uri"
struct Image
property data : Bytes
@@ -14,11 +15,14 @@ end
class Entry
JSON.mapping zip_path: String, book_title: String, title: String, \
size: String, pages: Int32, cover_url: String
size: String, pages: Int32, cover_url: String, id: String, \
title_id: String, encoded_path: String, encoded_title: String
def initialize(path, @book_title)
def initialize(path, @book_title, @title_id, storage)
@zip_path = path
@encoded_path = URI.encode path
@title = File.basename path, File.extname path
@encoded_title = URI.encode @title
@size = (File.size path).humanize_bytes
@pages = Zip::File.new(path).entries
.select { |e|
@@ -26,7 +30,8 @@ class Entry
MIME.from_filename? e.filename
}
.size
@cover_url = "/api/page/#{@book_title}/#{title}/1"
@id = storage.get_id @zip_path, false
@cover_url = "/api/page/#{@title_id}/#{@id}/1"
end
def read_page(page_num)
Zip::File.open @zip_path do |file|
@@ -51,20 +56,27 @@ class Entry
end
class Title
JSON.mapping dir: String, entries: Array(Entry), title: String
JSON.mapping dir: String, entries: Array(Entry), title: String,
id: String, encoded_title: String
def initialize(dir : String)
def initialize(dir : String, storage)
@dir = dir
@id = storage.get_id @dir, true
@title = File.basename dir
@encoded_title = URI.encode @title
@entries = (Dir.entries dir)
.select { |path| [".zip", ".cbz"].includes? File.extname path }
.map { |path| Entry.new File.join(dir, path), @title }
.map { |path|
Entry.new File.join(dir, path), @title, @id, storage
}
.select { |e| e.pages > 0 }
.sort { |a, b| a.title <=> b.title }
end
def get_entry(name)
@entries.find { |e| e.title == name }
def get_entry(eid)
@entries.find { |e| e.id == eid }
end
# For backward backward compatibility with v0.1.0, we save entry titles
# instead of IDs in info.json
def save_progress(username, entry, page)
info = TitleInfo.new @dir
if info.progress[username]?.nil?
@@ -75,7 +87,7 @@ class Title
info.progress[username][entry] = page
info.save @dir
end
def load_progress(username, entry : String)
def load_progress(username, entry)
info = TitleInfo.new @dir
if info.progress[username]?.nil?
return 0
@@ -85,10 +97,10 @@ class Title
end
info.progress[username][entry]
end
def load_percetage(username, entry : String)
def load_percetage(username, entry)
info = TitleInfo.new @dir
page = load_progress username, entry
entry_obj = get_entry entry
entry_obj = @entries.find{|e| e.title == entry}
return 0 if entry_obj.nil?
page / entry_obj.pages
end
@@ -136,9 +148,10 @@ class TitleInfo
end
class Library
JSON.mapping dir: String, titles: Array(Title), scan_interval: Int32, logger: MLogger
JSON.mapping dir: String, titles: Array(Title), scan_interval: Int32,
logger: MLogger, storage: Storage
def initialize(@dir, @scan_interval, @logger)
def initialize(@dir, @scan_interval, @logger, @storage)
# explicitly initialize @titles to bypass the compiler check. it will
# be filled with actual Titles in the `scan` call below
@titles = [] of Title
@@ -154,8 +167,8 @@ class Library
end
end
end
def get_title(name)
@titles.find { |t| t.title == name }
def get_title(tid)
@titles.find { |t| t.id == tid }
end
def scan
unless Dir.exists? @dir
@@ -165,7 +178,7 @@ class Library
end
@titles = (Dir.entries @dir)
.select { |path| File.directory? File.join @dir, path }
.map { |path| Title.new File.join @dir, path }
.map { |path| Title.new File.join(@dir, path), @storage }
.select { |title| !title.entries.empty? }
@logger.debug "Scan completed"
@logger.debug "Scanned library: \n#{self.to_pretty_json}"