download_tv 2.6.5 → 2.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b3bb73c3cccddd294060908acd7d79d619b1af0927aa51b5c7b7ac04aff6dd20
-  data.tar.gz: ea159d175a5bcdc1bdf71c35264756ee41d7da2d9b53aa7169258c37926279cf
+  metadata.gz: '09d470071b18c6859d55874249141ae57bfc68b538fc8a5e5ffb3ba27dfb9d89'
+  data.tar.gz: '08fa4240f9f2ab5fe00fbe5509932b9a05d4c5e7254da38aaa249ecee3c60dce'
 SHA512:
-  metadata.gz: f052f503bea9ceec1c5010b174680cd9efeb5f657d0db0747018cc232c2a66468e394a574776231472cb3506adf0f3a01def502e0adaa9dd86aa39a42e3328d4
-  data.tar.gz: 3a5d5d52294d770adc7c73879568c3ccfb88d7e88110bb78d02e7671b883cf8be88ad4e54e2c951d15f8508529d464b5014b4525068982c88598d80ae037830c
+  metadata.gz: 9a0f0390cf1f4d74f65a41e4704bca3d618043b6e72ad0a02716e5121276966016d60e9323f8392d77cb4bf07c1abb6289372d95214f575b9a7da3d620b5f993
+  data.tar.gz: 9271b796d80b9d0519699ca5f9acc0d26b88f190798474ca2128077324781df7f4205fffc4345f7d225b00635071177ca118d26ae0aacff2fc02e5174c3496e3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # download_tv CHANGELOG
 
+## 2.6.6 (2022-01-21)
+
+* Improvements
+	* The `--dry-run` option now prevents from persisting any configuration, including pending shows, not just the last execution date.
+	* Performance improvements when running with the `-t` flag.
+
 ## 2.6.5 (2021-06-10)
 
 * Fixes

data/README.md

@@ -6,13 +6,13 @@
 
 **download_tv** is a tool that allows the user to find magnet links for TV show episodes. It accepts shows as arguments, from a file or it can integrate with your MyEpisodes account.
 
-### Installation
+## Installation
 
 `gem install download_tv`
 
-### Usage
+## Usage
 
-Once installed, you can launch the binary *tv*
+Once installed, you can launch the binary `tv`
 
 ```
 Usage: tv [options]
@@ -86,6 +86,10 @@ Upon installation, the default filters exclude 2060p, 1080p or 720p, and include
 
 Keep in mind that this is not a hard filter. The application will sequentially apply as many user-defined filters as possible **while still returning at least one result**.
 
-### License
+## Shell completion
+
+The provided binary will print completion files to STDOUT by passing the options `--*-completion-bash` and `--*-completion-zsh` (you might have to escape the asterisk). Use your shell's manual to find out how to load these files to get completions.
+
+## License
 
 This project is released under the terms of the MIT license. See [LICENSE.md](https://github.com/guille/download_tv/blob/master/LICENSE.md) file for details.

data/bin/tv

@@ -47,7 +47,7 @@ opt_parser = OptionParser.new do |opts|
     options[:cmd] = 'showconfig'
   end
 
-  opts.on('--dry-run', "Don't write to the date file") do |n|
+  opts.on('--dry-run', "Don't update the persisted configuration") do |n|
     options[:dry] = n
   end
 

data/lib/download_tv/downloader.rb

@@ -66,17 +66,16 @@ module DownloadTV
     # the last run of the program
     # It connects to MyEpisodes in order to find which shows
     # to track and which new episodes aired.
-    # The param +dont_update_last_run+ prevents changing the configuration's date value
+    # The param +dry_run+ prevents changing the persisted configuration
     # The param +offset+ can be used to move the date back that many days in the check
     # The param +include_tomorrow+ will add the current day to the list of dates to search
-    def run(dont_update_last_run, offset = 0, include_tomorrow: false)
+    def run(dry_run = false, offset = 0, include_tomorrow: false)
       pending = @config.content[:pending].clone
       @config.content[:pending].clear
       pending ||= []
       date = date_to_check_from(offset)
 
-      pending.concat shows_to_download(date) if date < Date.today
-      pending.concat today_shows_to_download if include_tomorrow && date < Date.today.next
+      pending.concat shows_to_download(date, include_tomorrow) if date < (include_tomorrow ? Date.today.next : Date.today)
 
       if pending.empty?
         puts 'Nothing to download'
@@ -85,14 +84,14 @@ module DownloadTV
         puts 'Completed. Exiting...'
       end
 
-      unless dont_update_last_run
+      unless dry_run
         @config.content[:date] = if include_tomorrow
                                    Date.today.next
                                  else
                                    [Date.today, @config.content[:date]].max
                                  end
+        @config.serialize
       end
-      @config.serialize
     rescue InvalidLoginError
       warn 'Wrong username/password combination'
     end
@@ -126,20 +125,11 @@ module DownloadTV
       download_t.join
     end
 
-    def shows_to_download(date)
+    def shows_to_download(date, include_tomorrow)
       myepisodes = MyEpisodes.new(@config.content[:myepisodes_user],
                                   @config.content[:cookie])
       myepisodes.load_cookie
-      shows = myepisodes.get_shows_since(date)
-      shows = reject_ignored(shows)
-      fix_names(shows)
-    end
-
-    def today_shows_to_download
-      myepisodes = MyEpisodes.new(@config.content[:myepisodes_user],
-                                  @config.content[:cookie])
-      myepisodes.load_cookie
-      shows = myepisodes.today_shows
+      shows = myepisodes.get_shows_since(date, include_tomorrow: include_tomorrow)
       shows = reject_ignored(shows)
       fix_names(shows)
     end

data/lib/download_tv/myepisodes.rb

@@ -64,16 +64,11 @@ module DownloadTV
       @agent
     end
 
-    def get_shows_since(last)
+    def get_shows_since(last, include_tomorrow: false)
       page = @agent.get 'https://www.myepisodes.com/ajax/service.php?mode=view_privatelist'
       shows = page.parser.css('tr.past')
       shows = filter_newer_shows(shows, last)
-      build_show_strings(shows)
-    end
-
-    def today_shows
-      page = @agent.get 'https://www.myepisodes.com/ajax/service.php?mode=view_privatelist'
-      shows = page.parser.css('tr.today')
+      shows.concat(page.parser.css('tr.today')) if include_tomorrow
       build_show_strings(shows)
     end
 
@@ -81,7 +76,8 @@ module DownloadTV
     def filter_newer_shows(shows, date)
       shows.select do |i|
         airdate = i.css('td.date')[0].text
-        Date.parse(airdate) >= date
+        viewed_checkbox = i.css('td.status input').last
+        Date.parse(airdate) >= date && viewed_checkbox&.attribute('checked').nil?
       end
     end
 

data/lib/download_tv/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DownloadTV
-  VERSION = '2.6.5'
+  VERSION = '2.6.6'
 end

data/lib/download_tv.rb

@@ -14,7 +14,6 @@ require 'download_tv/torrent'
 require 'download_tv/filterer'
 require 'download_tv/myepisodes'
 require 'download_tv/linkgrabber'
-require 'download_tv/subtitles'
 
 module DownloadTV
   USER_AGENT = "DownloadTV #{DownloadTV::VERSION}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: download_tv
 version: !ruby/object:Gem::Version
-  version: 2.6.5
+  version: 2.6.6
 platform: ruby
 authors:
 - guille
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-10 00:00:00.000000000 Z
+date: 2022-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,7 +130,6 @@ files:
 - lib/download_tv/configuration.rb
 - lib/download_tv/downloader.rb
 - lib/download_tv/filterer.rb
-- lib/download_tv/grabbers/addic7ed.rb
 - lib/download_tv/grabbers/eztv.rb
 - lib/download_tv/grabbers/kat.rb
 - lib/download_tv/grabbers/torrentapi.rb
@@ -138,7 +137,6 @@ files:
 - lib/download_tv/grabbers/tpb.rb
 - lib/download_tv/linkgrabber.rb
 - lib/download_tv/myepisodes.rb
-- lib/download_tv/subtitles.rb
 - lib/download_tv/torrent.rb
 - lib/download_tv/version.rb
 - test/config_test.rb
@@ -165,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.17
+rubygems_version: 3.2.30
 signing_key:
 specification_version: 4
 summary: DownloadTV is a tool that allows the user to find magnet links for tv show

data/lib/download_tv/grabbers/addic7ed.rb

@@ -1,65 +0,0 @@
-# frozen_string_literal: true
-
-module DownloadTV
-  ##
-  # Addic7ed prototype (WIP)
-  class Addic7ed < LinkGrabber
-    def initialize
-      super('http://www.addic7ed.com/search.php?search=%s'\
-            '&Submit=Search')
-    end
-
-    def get_subs(show)
-      url = get_url(show)
-      download_file(url)
-    end
-
-    def get_url(show)
-      # Change spaces for the separator
-      s = show.gsub(' ', @sep)
-
-      # Format the url
-      search = Format(@url, s)
-
-      agent = Mechanize.new
-      res = agent.get(search)
-
-      # No redirection means no subtitle found
-      raise NoSubtitlesError if res.uri.to_s == search
-
-      ##########
-      # DO OPENSUBTITLES FIRST (see subtitles.rb)
-      #####
-
-      # We now have an URL like:
-      # http://www.addic7ed.com/serie/Mr._Robot/2/3/eps2.1k3rnel-pan1c.ksd
-
-      # To find the real links:
-      # see comments at the end of file
-    end
-
-    def download_file(url)
-      # Url must be like 'http://www.addic7ed.com/updated/1/115337/0'
-
-      # ADDIC7ED PROVIDES RSS
-
-      agent = Mechanize.new
-      page = agent.get(url, [], @url)
-      puts page.save('Hi')
-    end
-  end
-end
-# subtitles = {}
-# html.css('.tabel95 .newsDate').each do |td|
-#   if downloads = td.text.match(/\s(\d*)\sDownloads/i)
-#     done = false
-#     td.parent.parent.xpath('./tr/td/a[@class='buttonDownload']/@href').each do |link|
-#       if md = link.value.match(/updated/i)
-#         subtitles[downloads[1].to_i] = link.value
-#         done = true
-#       elsif link.value.match(/original/i) && done == false
-#         subtitles[downloads[1].to_i] = link.value
-#         done = true
-#       end
-#     end
-#   end

data/lib/download_tv/subtitles.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module DownloadTV
-  ##
-  # Manages the subtitles (WIP)
-  class Subtitles
-    def initialize
-      @a = Addic7ed.new
-    end
-
-    def get_subs(show)
-      @a.get_subs(show)
-    rescue NoSubtitlesError
-      puts "No subtitles found for #{show}"
-    end
-  end
-end