mangos 0.0.7 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b0746c4b67070f9b56de981d6a16394d2936c4ea
-  data.tar.gz: 4a47f473b5ead7a62a3b1e52860f9ef5e197780f
+SHA256:
+  metadata.gz: 56f79d3fe8221ed638d73e158b60c45bd18092993cb3117fd0fc83c2403ffd5e
+  data.tar.gz: 05e239fa6821f9a47cd345b8a8b1c045d853712bd41f7e6cb8f4ca93ce6915c0
 SHA512:
-  metadata.gz: e9a04b17f0ee303a06ab969f5968d69f8a6938ca85372842fd8e0f7fcb7f06a7d3f4deb929d6a25a986ad8a1a756083e299f22b3aaad09c9919f946c75566d1c
-  data.tar.gz: f1597e94001d6157a60578c44dca8386d364e0e88c2bf553b0e6dfc1356651864a008573a34cecb40458b7bc85ac43a3c5e3aeb00cf54391a978fb0f79f86f58
+  metadata.gz: 1fa3467468280687b46ee14b86f78c4cdb4949760d862b4b67a0454195225986f6677edcbe7ac1ec038cbde3b7bf4e4a2abb3350e243c62c01faee944c7693e7
+  data.tar.gz: 3bde1bfee0cf1e539d390623032fcc45ff6eee3682dc483e931a2f0044b2c10c9d926522c66218920e7834c04a3f07be8b73f7834b4cd8b98e5279a2d14b5819

data/bin/mangos

@@ -1,8 +1,25 @@
 #!/usr/bin/env ruby
 
+require "optparse"
 require "mangos"
 
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: #{File.basename(__FILE__)} [options] [manga package directory root]"
+
+  opts.on("-f", "--force", "Process all books in the package, even ones that seem up to date")
+  opts.on("-m", "--migrate", "Migrate package that incorrectly used the full pathnames to generate the book keys")
+
+  opts.on("-h", "--help", "Prints this help") do
+    puts opts
+    exit
+  end
+
+  opts.separator ""
+  opts.separator "If you do not supply a manga package directory root, then the current directory will be used."
+end.parse!(into: options)
+
 root_path = Pathname.new(ARGV.first || ".").realpath
 
-mangos = Mangos::Mangos.new(root_path)
+mangos = Mangos::Package.new(root_path, options)
 mangos.update

data/lib/mangos/book.rb

@@ -1,87 +1,29 @@
 class Mangos::Book
-  attr_reader :mangos
-  attr_accessor :path
+  attr_accessor :path, :page_paths, :pages, :published_on, :old_key, :key, :tags
 
-  def initialize(mangos)
-    @mangos = mangos
+  def from_hash(hash)
+    @path = hash["path"]
+    @page_paths = hash["pagePaths"]
+    @pages = hash["pages"]
+    @published_on = hash["publishedOn"]
+    @key = hash["key"]
+    @tags = hash["tags"]
   end
 
-  def path_hash
-    Digest::SHA256.hexdigest(path.to_s)[0..16]
-  end
-
-  def url
-    mangos.pathname_to_url(path, mangos.mangos_path)
-  end
-
-  def page_paths
-    path.children.select { |p| p.image? && !p.hidden? }.sort_by { |p| Naturally.normalize(p.basename) }
-  end
-
-  def page_urls
-    page_paths.map { |p| mangos.pathname_to_url(p, path) }
-  end
-
-  def title
-    title = path.relative_path_from(mangos.root_path).to_s
-    title = title.gsub("/", " / ")
-    title
-  end
-
-  def thumbnail_path
-    mangos.mangos_path + "img/thumbnails/" + "#{path_hash}.jpg"
-  end
-
-  def thumbnail_url
-    mangos.pathname_to_url(thumbnail_path, mangos.mangos_path)
-  end
-
-  #PREVIEW_WIDTH = 211
-  #PREVIEW_HEIGHT = 332
-  PREVIEW_WIDTH = 197
-  PREVIEW_HEIGHT = 310
-
-  PREVIEW_SMALL_WIDTH = 98
-  PREVIEW_SMALL_HEIGHT = 154
-
-  def generate_thumbnail
-    return if thumbnail_path.exist?
-
-    img = Magick::Image.read(page_paths.first).first
-
-    p_width = PREVIEW_WIDTH
-    p_height = PREVIEW_HEIGHT
-
-    if (img.columns > img.rows) && img.columns > p_width && img.rows > p_height #if it's landscape-oriented
-      img.crop!(Magick::EastGravity, img.rows / (p_height / p_width.to_f), img.rows) #Resize it so the right-most part of the image is shown
-    end
-
-    img.change_geometry!("#{p_width}>") { |cols, rows, _img| _img.resize!(cols, rows) }
-
-    img.page = Magick::Rectangle.new(img.columns, img.rows, 0, 0)
-    img = img.extent(p_width, p_height, 0, 0)
-    img.excerpt!(0, 0, p_width, p_height)
-
-    img.write(thumbnail_path)
-  rescue Exception => e
-    puts "There was an error generating thumbnail: #{e.inspect}"
-  end
-
-  def self.from_hash(mangos, data)
-    book = Mangos::Book.new(mangos)
-    book.path = mangos.url_to_pathname(Addressable::URI.parse(data["url"]))
+  def self.from_hash(hash)
+    book = new
+    book.from_hash(hash)
     book
   end
 
   def to_hash
     {
-      "url" => url,
-      "pageUrls" => page_urls,
-      "pages" => page_urls.length,
-      "title" => title,
-      "publishedOn" => path.mtime.to_i,
-      "thumbnailUrl" => thumbnail_url,
-      "key" => path_hash
+      "path" => @path,
+      "pagePaths" => @page_paths,
+      "pages" => @pages,
+      "publishedOn" => @published_on,
+      "key" => @key,
+      "tags" => @tags
     }
   end
 end

data/lib/mangos/book_updater.rb

@@ -0,0 +1,44 @@
+class Mangos::BookUpdater
+  attr_reader :package, :book
+
+  def initialize(package, book, path)
+    @package = package
+    @book = book
+    @path = path
+  end
+
+  def update
+    page_paths = find_page_paths
+
+    @book.old_key = @book.key
+    @book.key = Digest::SHA256.hexdigest(@path.basename.to_s)[0..16]
+    @book.page_paths = build_page_paths(page_paths)
+    @book.pages = page_paths.length
+    @book.path = @path.basename.to_s
+    @book.published_on = @path.mtime.to_i
+    @book.tags = Mangos::TagBreaker.new(@book.path).tags
+
+    fix_thumbnail_path if @package.migrate?
+    Mangos::Thumbnailer.new(page_paths.first, thumbnail_path).generate
+  end
+
+  def find_page_paths
+    image_paths = @path.children.select { |p| p.image? && !p.hidden? }
+    Naturalsorter::Sorter.sort(image_paths.map(&:to_s), true).map { |p| DecoratedPathname.new(p) }
+  end
+
+  def build_page_paths(page_paths)
+    Mangos::PagesDeflater.new(page_paths.map { |p| p.basename.to_s }).deflate
+  end
+
+  def thumbnail_path
+    @package.thumbnails_path + "#{@book.key}.jpg"
+  end
+
+  def fix_thumbnail_path
+    old_thumbnail_path = @package.thumbnails_path + "#{@book.old_key}.jpg"
+    if old_thumbnail_path.exist? && !thumbnail_path.exist?
+      old_thumbnail_path.rename(thumbnail_path)
+    end
+  end
+end

data/lib/mangos/decorated_pathname.rb

@@ -0,0 +1,9 @@
+class DecoratedPathname < Pathname
+  def image?
+    file? && extname && %w(.jpg .jpeg .png .gif).include?(extname.downcase)
+  end
+
+  def hidden?
+    basename.to_s[0..0] == "."
+  end
+end

data/lib/mangos/package.rb

@@ -0,0 +1,41 @@
+class Mangos::Package
+  attr_reader :path, :options
+
+  def initialize(path, options)
+    raise "path must be an instance of Pathname" unless path.is_a?(Pathname)
+
+    @path = DecoratedPathname.new(path)
+    @options = options
+  end
+
+  def update
+    app_path.mkdir unless File.exists?(app_path)
+    thumbnails_path.mkpath unless File.exists?(thumbnails_path)
+
+    Mangos::Update.new(self, Mangos::Processor.new(self)).update
+  end
+
+  def app_path
+    @path + ".mangos/"
+  end
+
+  def data_path
+    app_path + "data.json"
+  end
+
+  def key_mapping_path
+    app_path + "key_mapping.json"
+  end
+
+  def thumbnails_path
+    app_path + "img/thumbnails/"
+  end
+
+  def force?
+    @options[:force]
+  end
+
+  def migrate?
+    @options[:migrate]
+  end
+end

data/lib/mangos/pages_deflater.rb

@@ -0,0 +1,38 @@
+class Mangos::PagesDeflater
+  def initialize(page_paths)
+    @page_paths = page_paths
+  end
+
+  def deflate
+    last_ext = nil
+    last_base = nil
+    last_count = 0
+
+    out = []
+
+    @page_paths.each do |path|
+      path_parts = path.rpartition(".")
+      base, ext = path_parts.first, path_parts.last
+
+      if last_base.nil? || (ext != last_ext) || (base != last_base.succ)
+        if last_count > 0
+          out.last.replace("#{out.last}/#{last_count}")
+          last_count = 0
+        end
+
+        out << path
+      else
+        last_count += 1
+      end
+
+      last_base = base
+      last_ext = ext
+    end
+
+    if last_count > 0
+      out.last.replace("#{out.last}/#{last_count}")
+    end
+
+    out.join("|")
+  end
+end

data/lib/mangos/pages_inflater.rb

@@ -0,0 +1,28 @@
+class Mangos::PagesInflater
+  def initialize(page_paths)
+    @page_paths = page_paths
+  end
+
+  def inflate
+    paths = []
+
+    @page_paths.split("|").each do |part|
+      if part.include?("/")
+        name, count = part.split("/")
+
+        last_base, last_ext = name.split(".")
+
+        paths << name
+
+        count.to_i.times do
+          last_base.succ!
+          paths << "#{last_base}.#{last_ext}"
+        end
+      else
+        paths << part
+      end
+    end
+
+    paths
+  end
+end

data/lib/mangos/processor.rb

@@ -0,0 +1,19 @@
+class Mangos::Processor
+  def initialize(package)
+    @package = package
+    @original_mtime = @package.data_path.exist? ? @package.data_path.mtime : 0
+  end
+
+  def create(path)
+    Mangos::Book.new.tap { |book| Mangos::BookUpdater.new(@package, book, path).update }
+  end
+
+  def update(path, book)
+    return false if !@package.force? && path.mtime < @original_mtime
+    Mangos::BookUpdater.new(@package, book, path).update
+    true
+  end
+
+  def delete(book)
+  end
+end

data/lib/mangos/resort_pages_processor.rb

@@ -0,0 +1,20 @@
+class Mangos::ResortPagesProcessor
+  def initialize(package)
+    @package = package
+  end
+
+  def create(path)
+    raise "Not for new books!"
+  end
+
+  def update(path, book)
+    page_paths = Mangos::PagesInflater.new(book.page_paths).inflate
+    sorted_page_paths = Naturalsorter::Sorter.sort(page_paths, true)
+    book.page_paths = Mangos::PagesDeflater.new(sorted_page_paths).deflate
+    true
+  end
+
+  def delete(book)
+    raise "Not for deleted books!"
+  end
+end

data/lib/mangos/tag_breaker.rb

@@ -0,0 +1,43 @@
+class Mangos::TagBreaker
+  DELIMITERS = [
+    ['(', ')'],
+    ['[', ']'],
+    ['{', '}'],
+    ['<', '>']
+  ]
+
+  def initialize(text)
+    @text = text
+  end
+
+  def tags
+    results = []
+    DELIMITERS.each { |(open, close)| results.concat(extract(open, close)) }
+    results
+  end
+
+  def extract(open, close)
+    token_regexp = /[^#{Regexp.escape(open)}#{Regexp.escape(close)}]+/
+    delimiter_regexp = /[#{Regexp.escape(open)}#{Regexp.escape(close)}]/
+
+    scanner = StringScanner.new(@text)
+
+    results = []
+    stack = []
+
+    until scanner.eos? do
+      token = scanner.scan(token_regexp)
+      stack.each { |tag| tag << token } if token
+
+      delimiter = scanner.scan(delimiter_regexp)
+      case delimiter
+      when open
+        stack.push('')
+      when close
+        results << stack.pop
+      end
+    end
+
+    results.concat(stack).compact
+  end
+end

data/lib/mangos/thumbnailer.rb

@@ -0,0 +1,38 @@
+class Mangos::Thumbnailer
+  #PREVIEW_WIDTH = 211
+  #PREVIEW_HEIGHT = 332
+  PREVIEW_WIDTH = 197
+  PREVIEW_HEIGHT = 310
+
+  PREVIEW_SMALL_WIDTH = 98
+  PREVIEW_SMALL_HEIGHT = 154
+
+  def initialize(image_path, thumbnail_path)
+    @image_path = image_path
+    @thumbnail_path = thumbnail_path
+  end
+
+  def generate
+    return if @thumbnail_path.exist?
+    return if @image_path.nil? || @image_path.to_s == ''
+
+    img = Magick::Image.read(@image_path).first
+
+    p_width = PREVIEW_WIDTH
+    p_height = PREVIEW_HEIGHT
+
+    if (img.columns > img.rows) && img.columns > p_width && img.rows > p_height #if it's landscape-oriented
+      img.crop!(Magick::EastGravity, img.rows / (p_height / p_width.to_f), img.rows) #Resize it so the right-most part of the image is shown
+    end
+
+    img.change_geometry!("#{p_width}>") { |cols, rows, _img| _img.resize!(cols, rows) }
+
+    img.page = Magick::Rectangle.new(img.columns, img.rows, 0, 0)
+    img = img.extent(p_width, p_height, 0, 0)
+    img.excerpt!(0, 0, p_width, p_height)
+
+    img.write(@thumbnail_path)
+  rescue Exception => e
+    puts "There was an error generating thumbnail: #{e.inspect}"
+  end
+end

data/lib/mangos/update.rb

@@ -1,67 +1,90 @@
 class Mangos::Update
-  attr_reader :mangos
   attr_accessor :books
 
-  def initialize(mangos)
-    @mangos = mangos
-
-    @directories = mangos.root_path.descendant_directories.reject { |p| p.basename.to_s[0..0] == '.' }
+  def initialize(package, processor)
+    @package = package
+    @processor = processor
     @books = []
-    #load_data
+  end
+
+  def update
+    puts "Running with options #{@package.options.inspect}" unless @package.options.empty?
+    load_data
     process
     save_data
-    puts "\nDone!"
+    save_key_mapping if @package.migrate?
+    puts "Done!"
   end
 
   def load_data
-    self.books = (Mangos::Mangos.load_json(mangos.mangos_path + "data.json") || []).map { |b| Mangos::Book.from_hash(mangos, b) }
+    return unless @package.data_path.exist?
+
+    puts "Reading in JSON file"
+    @books = JSON.parse(@package.data_path.read).map { |b| Mangos::Book.from_hash(b) }
   end
 
   def save_data
-    puts "\nWriting out JSON file"
-    books_hashes = []
-    books.each_with_index do |b, i|
-      $stdout.write "\rProcessing #{i + 1} of #{books.length} (#{(((i + 1) / books.length.to_f) * 100.0).round}%)"
-      $stdout.flush
+    puts "Writing out JSON file"
+    @package.data_path.write(@books.map { |b| b.to_hash }.to_json)
+  end
 
-      books_hashes << b.to_hash
-    end
-    Mangos::Mangos.save_json(mangos.mangos_path + "data.json", books_hashes)
+  def save_key_mapping
+    puts "Writing out key mapping JSON file"
+    @package.key_mapping_path.write(@books.to_h { |b| [b.old_key, b.key] }.to_json)
   end
 
   def process
-    puts "\nLoading books"
-    @directories.each_with_index do |d, i|
-      $stdout.write "\rProcessing #{i + 1} of #{@directories.length} (#{(((i + 1) / @directories.length.to_f) * 100.0).round}%)"
+    puts "Processing books...\n"
+
+    @new_books = 0
+    @updated_books = 0
+    @skipped_books = 0
+    @deleted_books = 0
+
+    paths = all_paths
+    paths.each_with_index do |p, i|
+      $stdout.write "\rProcessing #{i + 1} of #{paths.length} (#{(((i + 1) / paths.length.to_f) * 100.0).round}%)"
       $stdout.flush
 
-      created d
+      process_path(p)
     end
-    #handle deleted first
-    #@directories.each do |d|
-    #  puts "d: #{d.inspect}"
-    #  book = books.find { |b| b.path == d }
-    #  if book
-    #    updated(book)
-    #  else
-    #    created(d)
-    #  end
-    #end
+
+    process_deleted
+
+    puts "\nProcessed #{@new_books} new books, updated #{@updated_books} existing books, removed #{@deleted_books} deleted books, and skipped #{@skipped_books} books"
   end
 
-  def deleted
-    #
+  def process_deleted
+    books_to_remove = @books.reject do |book|
+      path = @package.path + book.path
+      path.exist?
+    end
+
+    @deleted_books = books_to_remove.length
+
+    books_to_remove.each { |book| @processor.delete(book) }
+
+    @books -= books_to_remove
   end
 
-  def created(directory)
-    book = Mangos::Book.new(mangos)
-    book.path = directory
-    book.generate_thumbnail
-    books << book
+  def process_path(path)
+    book_path = path.basename.to_s
+
+    book = @books.find { |b| b.path == book_path }
+
+    if book
+      if @processor.update(path, book)
+        @updated_books += 1
+      else
+        @skipped_books += 1
+      end
+    else
+      @books << @processor.create(path)
+      @new_books += 1
+    end
   end
 
-  def updated(book)
-    puts "updating: #{book.inspect}"
-    #
+  def all_paths
+    @package.path.children.reject { |p| p.hidden? }.select { |p| p.directory? }
   end
-end
+end

data/lib/mangos/version.rb

@@ -1,3 +1,3 @@
 module Mangos
-  VERSION = "0.0.7"
+  VERSION = "0.3"
 end

data/lib/mangos.rb

@@ -4,19 +4,24 @@ require "fileutils"
 require "uri"
 require "json"
 require "digest"
+require "strscan"
 
 #Gems
 require "addressable/uri"
-require "naturally"
-require "RMagick"
-
-#Core Extensions
-require "mangos/core_ext/pathname"
+require "naturalsorter"
+require "rmagick"
 
 module Mangos
 end
 
-require "mangos/mangos"
-require "mangos/mangos_package"
+require "mangos/decorated_pathname"
+require "mangos/processor"
+require "mangos/resort_pages_processor"
+require "mangos/tag_breaker"
+require "mangos/package"
 require "mangos/update"
 require "mangos/book"
+require "mangos/pages_deflater"
+require "mangos/pages_inflater"
+require "mangos/thumbnailer"
+require "mangos/book_updater"

data/mangos.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", ">= 1.0.0"
   s.add_dependency "addressable", ">= 2.3.5"
-  s.add_dependency "naturally", ">= 1.0.3"
+  s.add_dependency "naturalsorter", ">= 3.0.14"
   s.add_dependency "rmagick", ">= 2.13.1"
 
   s.files        = `git ls-files`.split("\n")