addic7ed_downloader 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83c1432b32d4da49732cec95bfb9d9e2f8d3f587
-  data.tar.gz: 571af168a3af02b753dde537266c469ed41422ab
+  metadata.gz: 7e8291a5cc00db31a5135428ffbe38b85af7026b
+  data.tar.gz: acacc9165cdd48303465df2debec24abc6c4b192
 SHA512:
-  metadata.gz: e20a724c07ba974f9394dc670e4a76bf24ac92890f2a72e39183987fdbb8e588c058a1aa98c3c37461a593eafc9ed8455b206207b16c9449cb9fb57aa38e9e18
-  data.tar.gz: d0046e5dadb87deafe45e69adadc511b9e30150daa756ea76a1a82fe0e6df5ce18586c52ce2a8de7831075ada35c830f70ff658230deb469253460931e7c531c
+  metadata.gz: c520ba0be1e905eb0bc8042c68d1fc8d332a9c6000e67bc9ef39e2408a8d154fda43623b83b1321beb150f5cdc4eca1c6758b2545df36a32cecbecc5b3c4f526
+  data.tar.gz: 91e6a2056e1689d4a9100d078db36a197a23ad94529ea460debf61425cf684c8af97a12ce4aa5e9abf277c7ba44617acbf09891d102a63869cbb8a647687703a

data/lib/addic7ed_downloader.rb

@@ -1,6 +1,4 @@
 require 'addic7ed_downloader/search'
-require 'addic7ed_downloader/search_filename'
-require 'addic7ed_downloader/search_string'
 require 'addic7ed_downloader/subtitle'
 require 'addic7ed_downloader/common'
 require 'addic7ed_downloader/version'

data/lib/addic7ed_downloader/search.rb

@@ -12,6 +12,24 @@ module Addic7edDownloader
 
     attr_accessor :showname, :season, :episode, :lang, :tags, :path
 
+    def self.by_filename(filename, options = {})
+      showname = filename[SHOWNAME_REGEXP, 1].strip
+      season   = filename[SEASON_REGEXP, 1].to_i
+      episode  = filename[EPISODE_REGEXP, 1].to_i
+      options[:tags] = filename[TAGS_REGEXP, 1].split(TAGS_FILTER_REGEXP)
+
+      new(showname, season, episode, options)
+    end
+
+    def self.by_string(search_string, options = {})
+      showname = search_string[SHOWNAME_REGEXP, 1].strip
+      season   = search_string[SEASON_REGEXP, 1].to_i
+      episode  = search_string[EPISODE_REGEXP, 1].to_i
+      options[:tags] = options[:filename][TAGS_REGEXP, 1].split(TAGS_FILTER_REGEXP) if options[:filename]
+
+      new(showname, season, episode, options)
+    end
+
     def initialize(showname, season, episode, options = {})
       @showname = showname
       @season = season.to_i
@@ -81,7 +99,7 @@ module Addic7edDownloader
 
       # Create a list with results
       subtitles = page.css('div#container95m').each_with_object([]) do |subtitle, list|
-        list << Addic7ed::Subtitle.new(subtitle) if subtitle.at('.NewsTitle')
+        list << Subtitle.new(subtitle) if subtitle.at('.NewsTitle')
       end
 
       subtitles.sort!.reverse!

data/lib/addic7ed_downloader/version.rb

@@ -1,3 +1,3 @@
 module Addic7edDownloader
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: addic7ed_downloader
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - David Marchante
@@ -185,8 +185,6 @@ files:
 - lib/addic7ed_downloader.rb
 - lib/addic7ed_downloader/common.rb
 - lib/addic7ed_downloader/search.rb
-- lib/addic7ed_downloader/search_filename.rb
-- lib/addic7ed_downloader/search_string.rb
 - lib/addic7ed_downloader/subtitle.rb
 - lib/addic7ed_downloader/version.rb
 homepage: https://github.com/iovis9/addic7ed_downloader

data/lib/addic7ed_downloader/search_filename.rb

@@ -1,12 +0,0 @@
-module Addic7edDownloader
-  module SearchFilename
-    def self.search(filename, options = {})
-      showname = filename[SHOWNAME_REGEXP, 1].strip
-      season   = filename[SEASON_REGEXP, 1].to_i
-      episode  = filename[EPISODE_REGEXP, 1].to_i
-      options[:tags] = filename[TAGS_REGEXP, 1].split(TAGS_FILTER_REGEXP)
-
-      Search.new(showname, season, episode, options)
-    end
-  end
-end

data/lib/addic7ed_downloader/search_string.rb

@@ -1,12 +0,0 @@
-module Addic7edDownloader
-  module SearchString
-    def self.search(search_string, options = {})
-      showname = search_string[SHOWNAME_REGEXP, 1].strip
-      season   = search_string[SEASON_REGEXP, 1].to_i
-      episode  = search_string[EPISODE_REGEXP, 1].to_i
-      options[:tags] = options[:filename][TAGS_REGEXP, 1].split(TAGS_FILTER_REGEXP)
-
-      Search.new(showname, season, episode, options)
-    end
-  end
-end