yotsuba 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16007be3d5d092565144cf0cf084846a0b881ed6
-  data.tar.gz: 5ca4d65b96c42ff5ae3e5ca9217e38f742060929
+  metadata.gz: cebbf4e4596c2d1ba5105d93b01d08f217973d18
+  data.tar.gz: 248551e062b33657f79bcfe217c726790780a096
 SHA512:
-  metadata.gz: 271b8be2a043ee6e55de1e323f36f34a4365e09d42674c535031a3654724d96f744306533e90e89590236d35d16fa3ea36b7de135a8306bbd6f458367ba79bad
-  data.tar.gz: 0443bc79d9f83bd72e445b1947aca5f17a94aa206cf44f13a7bc4abfe055f2a4abb35b32be25cb6447d85b9842292271d51fab105912c267315eedd2deabf694
+  metadata.gz: 50deeea2270c036f0206f5c30511c39fa507b714ee900e8cc6e36a951135d9e31b267aa907d817ba45d62f8db0cdba425ca6b9a2763fbd02a4cfea345a02f495
+  data.tar.gz: 1d30a778451ff5f89f32d00e2d69d3cb0ea385e5323f57e2deb64667eb4531da4050eca95cdeaa0570c299267ec64bcfdde240e9639eef350c12762bfd700dc0

data/lib/yotsuba/anime.rb

@@ -25,36 +25,48 @@ module Yotsuba
     end
 
     def self.all
-      Yotsuba.get_animes if @@all_animes.length == 0
+      precache_animes
       @@all_animes
     end
 
     def self.[](key)
-      Yotsuba.get_animes if @@all_animes.length == 0
-      results = []
-      single = false
+      return Anime.find_by(title: key) if key.is_a?(String)
+      return Anime.find_by(id: key) if key.is_a?(Fixnum)
+      return Anime.search(key) if key.is_a?(Regexp)
+
+      raise(ArgumentError, "Argument should be a String (title), Fixnum (id), or Regexp (matches title).")
+    end
 
-      search = Proc.new { |a|
-        single = true
-        results << a if a.title == key
-      } if key.is_a?(String)
+    def self.find_by(hash = {title: nil, id: nil})
+      precache_animes
+      @@all_animes.each do |anime|
+        match = check_property(anime, :id, hash) || check_property(anime, :title, hash)
+        return match if match
+      end
+    end
 
-      search = Proc.new { |a|
-        single = true
-        results << a if a.id == key
-      } if key.is_a?(Fixnum)
+    def self.find(id)
+      Anime.find_by(id: id)
+    end
 
-      search = Proc.new { |a|
-        single = false
-        results << a if a.title.match(key)
-      } if key.is_a?(Regexp)
+    def self.search(regexp)
+      precache_animes
+      results = []
+      @@all_animes.each do |anime|
+        results << anime if anime.title.match(regexp)
+      end
+      return results
+    end
 
-      raise(ArgumentError, "Argument should be a String (title), Fixnum (id), or Regexp (matches title).") if search.nil?
+    private
 
-      @@all_animes.each &search
-      return single ? results[0] : results
+      def self.precache_animes
+        Yotsuba.get_animes if @@all_animes.length == 0
+      end
 
-    end
+      def self.check_property(object, symbol, hash)
+        hash[symbol] && object.respond_to?(symbol) && object.send(symbol) == hash[symbol] ? object : nil
+      end
 
   end
 end

data/lib/yotsuba/download.rb

@@ -7,27 +7,30 @@ module Yotsuba
   class Download
     include Concurrent::Async
 
-    attr_reader :status
+    @@all_downloads = []
 
-    def initialize(options = {filename: nil, link: nil, part_links: nil, output_dir: nil })
-      @filename = options[:filename]
-      @link = options[:link]
-      @part_links = options[:part_links]
-      @output_dir = File.absolute_path(options[:output_dir]) if options[:output_dir]
-      @status = "Queued"
-
-      @output_dir ||= "."
+    attr_reader :status, :file, :id
 
-      if @link.nil? && @part_links && @part_links.length == 1
-        @link = @part_links.first
-        @part_links = nil
+    def initialize(options = {animefile: nil, output_dir: "." })
+      @file = options[:animefile]
+      @output_dir = File.absolute_path(options[:output_dir])
+      @multiple = (@file.download_links.length > 1) if @file
+      @status = "Queued"
+      if self.valid?
+        @id = @@all_downloads.length + 1
+        @@all_downloads << self if self.valid?
       end
+
       init_mutex # Required by Concurrent::Async
     end
 
+    def valid?
+      self.file != nil
+    end
+
     def run
-      @path = File.join(@output_dir, @filename) if @link
-      @path = File.join(@output_dir, @filename+".zip") if @part_links
+      @path = @multiple ? File.join(@output_dir, @filename+".zip") : @path = File.join(@output_dir, @filename)
+
       FileUtils.mkdir_p @output_dir
 
       if File.exists? @path
@@ -35,15 +38,10 @@ module Yotsuba
         return
       end
 
-      if @part_links
-        @part_links.each do |link|
-          create_request(link).run
-        end
-        finish_request
-      elsif @link
-        create_request(@link).run
-        finish_request
+      @file.download_links.each do |link|
+        create_request(link).run
       end
+      finish_request
     end
 
     def run_async
@@ -54,10 +52,41 @@ module Yotsuba
       File.delete(@path) if @path
     end
 
-    def bytes_downloaded
+    def bytes_written
       @path ? File.size(@path) : 0
     end
 
+    def percent_downloaded
+      100.0 * self.bytes_written / self.file.size
+    end
+
+    def self.all
+      @@all_downloads
+    end
+
+    def self.[](key)
+      return self.find_by(id: key) if key.is_a?(Fixnum)
+      return self.find_by(file: key) if key.is_a?(AnimeFile)
+      return self.find_by(filename: key) if key.is_a?(String)
+      return self.find_by
+    end
+
+    def self.find_by(hash = {id: nil, file: nil, filename: nil, status: nil, percent_downloaded: nil})
+      @@all_downloads.each do |download|
+        match = check_property(download, :id, hash) ||
+        check_property(download, :file, hash) ||
+        check_property(download, :filename, hash) ||
+        check_property(download, :status, hash) ||
+        check_property(download, :percent_downloaded, hash)
+
+        return match if match
+      end
+    end
+
+    def self.find(id)
+      return Download.find_by(id: id)
+    end
+
     private
 
       def create_request(link)
@@ -81,5 +110,9 @@ module Yotsuba
         @file_handle.close
       end
 
+      def check_property(object, symbol, hash)
+        hash[symbol] && object.respond_to?(symbol) && object.send(symbol) == hash[symbol] ? object : nil
+      end
+
   end
 end

data/lib/yotsuba/file.rb

@@ -22,7 +22,15 @@ module Yotsuba
     end
 
     def download(output_dir)
-      Download.new(filename: self.name, part_links: self.download_links, output_dir: output_dir)
+      @download ||= Download.new(animefile: self, output_dir: output_dir)
+    end
+
+    def ==(other_file)
+      other_file && self.id == other_file.id
+    end
+
+    def eq(other_file)
+      self == other_file
     end
 
   end

data/lib/yotsuba/version.rb

@@ -1,3 +1,3 @@
 module Yotsuba
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: yotsuba
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Suchipi Izumi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-04-14 00:00:00.000000000 Z
+date: 2015-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler