AnimeDL 0.2.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5c597af419781934b0aba910c983bf287d16a7cc
-  data.tar.gz: 0b00fe6433f0563b62557dc1580903422fe7aee5
+SHA256:
+  metadata.gz: 0e5e478e8a86cb5f8215af8aad1586028288f8cc8106eacf459c48d1bd99100d
+  data.tar.gz: 76b3925b61f39259701df307aa9e2b46e8d6dcf034aec6576e88da15623cdc9f
 SHA512:
-  metadata.gz: f804d2a018ff858d7a410a22b210dfc28c5c84799829244c176a4a5ffed513bee979c1f775d091ea3f7f8c53a48d3b84aedabf3c1f838a1cb1472ec273705f32
-  data.tar.gz: 13578dffb80986c25df8a951a110340f018b05b439ff95fb0f07a5a693679b6c437c510d6c603155c6f2e206cf8acc580b2677330ec25f95306135a778090fda
+  metadata.gz: f5bbd47f17f794a72045563b676fa125aa9e3a45e730528fd3b5fd9ac3be7526bcf4bf7242bb1b8681b787175caf1d498e3a4c5fe3aaeffbff1873494142aecf
+  data.tar.gz: a9e7b929234af8b7a44e9a1cfc6af576894e5eaeaeadff3dc96a0726a8db3338d78d4e4c7a3ae6c112f27ccf730f348eb71a83a1bae9dfce253fd9f6b05aaa2c

data/.gitignore

@@ -1 +1,4 @@
 test*
+AnimeDL_Bundler
+*.gem
+*script*

data/README.md

@@ -57,8 +57,7 @@ On choosing a particular anime, the user can then choose to get links or downloa
 
     `$ anime-dl`                          - (downloads videos to './anime_name/')]  
     `$ anime-dl -f .`                     - (downloads videos to './')]  
-    `$ anime-dl -f /path/to/directory`    - (downloads videos to '/path/to/directory/anime_name/')]  
-    `$ anime-dl -f /path/to/directory/`   - (downloads videos to '/path/to/directory/anime_name/')]  
+    `$ anime-dl -f /path/to/directory`    - (downloads videos to '/path/to/directory/')]
 
 
 ### Specifying Episodes: 

data/anime_dl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "AnimeDL"
-  spec.version       = "0.2.4"
+  spec.version       = "1.0.5"
   spec.authors       = ["Anirudh Sundar"]
   spec.email         = "anirudhsundar@hotmail.com"
 

data/bin/anime-dl

@@ -6,7 +6,7 @@ require "fileutils"
 # APP OPTIONS
 options = { episode: true, file: nil, quiet: false }
 help_statements = {
-  episode: %Q[Prevents the app from asking for an Episodes prompt. Gets detals for all episodes.],
+  episode: %Q[Prevents the app from asking for an Episodes prompt. Gets details for all episodes.],
   file: %Q[Provide location to store extracted details. Creates sub-directories as needed. (Usage Examples below).],
   quiet: %Q[Suppresses large, in-program help statements.],
   help: %Q[Shows this message and exits.],
@@ -45,7 +45,7 @@ ARGV.options do |opts|
 
 
   opts.on( "-v", "--version", help_statements[:version]) do
-    puts "AnimeDL: Version 0.2.4"
+    puts "AnimeDL: Version 1.0.5"
     exit
   end
 
@@ -63,8 +63,7 @@ ARGV.options do |opts|
   opts.separator "(If user chooses to DOWNLOAD videos)"
   opts.separator %Q[  `$ anime-dl`                          (downloads videos to './anime_name/')]
   opts.separator %Q[  `$ anime-dl -f .`                     (downloads videos to './')]
-  opts.separator %Q[  `$ anime-dl -f /path/to/directory`    (downloads videos to '/path/to/directory/anime_name/')]
-  opts.separator %Q[  `$ anime-dl -f /path/to/directory/`   (downloads videos to '/path/to/directory/anime_name/')]
+  opts.separator %Q[  `$ anime-dl -f /path/to/directory`    (downloads videos to '/path/to/directory/')]
   opts.separator ""
 
   opts.separator "Specifying Episodes:"
@@ -99,11 +98,11 @@ unless (options[:quiet])
               "Or you can also provide multiple space-seperated ranges with each range having the format 'start-end'.\n" +
               "Examples (assuming anime below has more than 18 episodes):\n" +
               "    `Episodes: 2 4 5` - Retrieves details for episodes 2, 4 and 5\n" +
-              "    `Episodes: 4-8` - Retrieves details for episodes 4 to 8\n" +
+              "    `Episodes: 4-7` - Retrieves details for episodes 4, 5, 6 and 7\n" +
               "    `Episodes: 8-l` - Retrieves details for episodes 8 to the last episode\n" +
-              "    `Episodes: 2 9-13 18-l` - Retrieves details for episodes 2, 9 to 13 and 18 to end\n" +
+              "    `Episodes: 2 9-11 18-l` - Retrieves details for episodes 2, 9, 10, 11 and 18 to the end\n" +
               "(Running app with '-a' or '--all' will automatically retrieve all episodes)\n" +
-              "(Enter empty response to get all episodes, '-1' exits)\n\n"
+              "(Enter empty response to get all episodes or '-1' to exit)\n\n"
   }
 else
   $user_prompts = {
@@ -231,7 +230,7 @@ begin
 
   end
 rescue => error
-  puts "\nDirectory creation failed."
+  puts "\nDirectory creation failed.\n\n"
   puts error
   exit
 end
@@ -264,14 +263,14 @@ else
 end
 
 # Links
-links = instance.getLinks(choice, range, options[:quiet], to_print)
+links = instance.getVideoLinks(choice, range, options[:quiet], to_print)
 file_write(options[:file], links, choice)   if (options[:file] && scrape_option == 'l')
 
 # Downloads
 if ( scrape_option == 'd' )
   if (options[:file] == nil)
     options[:file] = choice.content.split(" | ")[0]
-    Dir.mkdir( options[:file] )
+    FileUtils.mkdir_p( options[:file] )
   end
 
   AnimeDL.download(options[:file], links)

data/lib/anime_dl.rb

@@ -14,7 +14,7 @@ module AnimeDL
     # Search
     def search(query)
       results_page = @agent.get("http://animeheaven.eu/search.php?q=#{query}")
-      return results_page.search(".iepsan")
+      return results_page.search(".iepcon").search(".cona")
     end
 
     # Returns the total number of episodes
@@ -22,13 +22,28 @@ module AnimeDL
       @anime_page = @agent.get(option.attributes['href'].value)  unless (@anime_page)
       episodes = @anime_page.search(".infoepbox").search("a")
 
-      first = episodes.last.search(".infoept2")[0].content.to_i
-      last = episodes.first.search(".infoept2")[0].content.to_i
+      # New Episodes have a different class
+      begin
+        first = episodes.last.search(".infoept2")[0].content.to_i
+      rescue
+        first = episodes.last.search(".infoept2r")[0].content.to_i
+      end
+      begin
+        last = episodes.first.search(".infoept2")[0].content.to_i
+      rescue
+        last = episodes.first.search(".infoept2r")[0].content.to_i
+      end
+
       return first, last
     end
 
 
     # UTILITY
+    def parseURL(url)
+      url = url.to_s[/luu1=rrl\(".*?"\)/][10...-2]
+      return url.tr("ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", "NOPQRSTUVWXYZABCDEFGHIJKLMnopqrstuvwxyzabcdefghijklm")
+    end
+
     def limit_exceeded(quiet)
       return  "Unfortunately \"animeheaven.eu\" only allows a certain number of page views per day (>170, <350).\n" +
               "It seems you have exceeded that limit :(.\n" +
@@ -36,7 +51,6 @@ module AnimeDL
 
       return  "(Limit exceeded)"
     end
-
   end
 
   # Download

data/lib/anime_dl/anime_heaven.rb

@@ -16,7 +16,7 @@ module AnimeDL
     end
 
     # Video Links
-    def getLinks(option, range, quiet = false, output = false)
+    def getVideoLinks(option, range = [], quiet = false, output = false)
       episode_links = getPageLinks(option, range)
       episodes = []
 
@@ -37,17 +37,13 @@ module AnimeDL
 
         # Video Link Retrieval
         episode_no = episode_page.uri.to_s[/e=.+/][2..-1]    # (Regex for safety)
-        video_src = episode_page.search("script")[2].to_s[/src='http.*?'/][5...-1]
+        video_src = parseURL(episode_page.search("script")[3])
 
         episode = Episode.new(episode_no, video_src)
         episodes << episode
 
         # Progress Bar increment
-        begin
-          progress_bar.progress += 1  unless (output)
-        rescue
-          # Bypass InvalidProgressBar Error if raised
-        end
+        progress_bar.progress += 1  unless (output)  rescue nil
 
         puts episode.details  if (output)
       end

data/lib/episode.rb

@@ -9,33 +9,31 @@ class Episode
   attr_reader :number, :link
 
   def download_to(path = ".")
-    url_base = @link.split('/')[2]
-    url_path = '/'+@link.split('/')[3..-1].join('/')
+    url_base = @link.split('/')[2]                    # Animeheaven
+    url_path = '/'+@link.split('/')[3..-1].join('/')  # Sub Url
 
     Net::HTTP.start(url_base) do |http|
       response = http.request_head(URI.escape(url_path))
       progress_bar = ProgressBar.create(:progress_mark => "\#", :length => 80, :total => response['content-length'].to_i)
-      file = File.new( File.join( path, "Episode #{@number}.mp4" ), 'w')
+      file = File.new( File.join( path, "Episode #{@number}.mp4.tmp" ), 'w')
 
       begin
         http.get(URI.escape(url_path)) do |str|
           file.write(str)
-
-          begin
-            progress_bar.progress += str.length
-          rescue
-            # Bypass InvalidProgressBar Error if raised
-          end
+          progress_bar.progress += str.length  rescue nil
         end
       rescue Exception
         # Handle SystemExit or Interrupt
-        puts "Download incomplete. Deleting file."
-        File.delete(File.join( path, "Episode #{@number}.mp4" ))
+        puts "Download incomplete. Deleting file.\n\n"
+        file.close
+        File.delete(File.join( path, "Episode #{@number}.mp4.tmp" ))
         raise
         exit
       end
 
       progress_bar.finish
+      file.close
+      File.rename(file, File.join( path, "Episode #{@number}.mp4" ))
     end
 
     puts "\n"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: AnimeDL
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Anirudh Sundar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-02 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: The AnimeDL gem is used to get episode links or download episodes for a particular