AnimeDL 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c4ab79d1ef8cdd5e1358c92ea756e281050ca61
-  data.tar.gz: 1d3a2171a534122c4d2c6a3f62b2cf6cc4112f7e
+  metadata.gz: 52febf6fdb8981cf896a688f8c64076b4cd761aa
+  data.tar.gz: 518aa6c64b9eb087522df785223ceaea46349365
 SHA512:
-  metadata.gz: c8f5495fb0dbe795148c8ba90986607eae29105c1e497d79e11c1e62465531a9972d83093db6502704b1faf18105c5b340f1dff057ac3ad69b0c4785506be130
-  data.tar.gz: 552eeff77729d8797cc6995d162db669ff5513664c1036360b272727ff4040a5300c3a7a0b880e993a58a8e6211dcd5c03aed01bae23b6c3fc384743dd594cf3
+  metadata.gz: 4dc8edc0b2f5d402b40a1643dfe2504a3d66d6c4b4f00b2ee6a4d4545de7eb3418cdedcdc0c7f44a4b3e6733601cfe50fbe24fa3319732438fb649dd5f65a1d5
+  data.tar.gz: 996c68554bab7013574b518a90562bb4024fb58cdd3590ff3d6c5337fe4f647ec11a4cf3068ccd68fd13c92de2fa8e39893dd319e64f7780c7321be11768c717

data/README.md

@@ -1,6 +1,6 @@
 # AnimeDL
 
-<p align='center' style="width: 75%">
+<p align='center'>
 <img src='https://github.com/anirudhsundar98/AnimeDL/raw/master/fmab_anime_dl.jpg' alt='FMAB Stone'>
 </p>
 
@@ -8,11 +8,12 @@ An app used to download anime episodes or get links to video sources of episodes
 
 ## Installation
 
-
 Install the application with:
 
     $ gem install AnimeDL
 
+and run `anime-dl` on the command line.  
+
 
 <br>
 
@@ -29,63 +30,49 @@ And then execute:
 ## Usage
 
 On running the command the program prompts the user for a search query and prints a list of search results.  
-The user can then choose a particular anime.  Details for all episodes are scraped.  
-To select particular episodes call the app with the '-e' option.
+On choosing a particular anime, the user can then choose to get links or download videos and choose which episodes to scrape.
 
 
 #### Links:
- To output links to a file, provide the path to a file as the last argument.  
+ To output links to a file, provide the path to a file with '--file'.  
  If argument is a directory, a new text file will be created in that directory.
+ If '--file' is not provided, links are printed on the command line.
 
 #### Downloads: 
-To download videos to particular directory, specify the directory as the last argument.  
-If no directory is specified the videos are downloaded to ./anime_name/
-
-### Examples:
-    `$ anime_dl`                                        - (outputs link urls on the terminal)    
-    `$ anime_dl -f rel/path/to/filename.txt`            - (outputs link urls to 'rel/path/to/filename.txt')  
-    `$ anime_dl -o link -f rel/path/to/directory/`      - (outputs link urls to 'rel/path/to/directory/anime\_name.txt')  
-    `$ anime_dl -o download`                            - (downloads videos to './anime\_name/')  
-    `$ anime_dl -o download -f .`                       - (downloads videos to './')  
-    `$ anime_dl -o d -f /abs/path/to/directory`         - (downloads videos to '/abs/path/to/directory/anime\_name/')  
-    `$ anime_dl -o download -f /abs/path/to/directory/` - (downloads videos to '/abs/path/to/directory/anime\_name/')   
-
-### Example App Usage:
-```
-$ anime_dl -q
-    Enter Search Query: fullmetal alchemist b
+ To download videos to particular directory, specify the directory with '--file'.  
+ If no directory is specified the videos are downloaded to ./anime_name/
 
-    0. (Exit)
-    1. Fullmetal Alchemist Brotherhood Dubbed | Hagane no Renkinjutsushi (2009) Dubbed
-    2. Fullmetal Alchemist Brotherhood | Hagane no Renkinjutsushi (2009)
-    3. (Enter new Search Query)
+### Example Usage:
+  (If user chooses to scrape LINKS)  
 
-    Choice: 4
+    `$ anime-dl`                          - (outputs link urls on the terminal)]  
+    `$ anime-dl -f path/to/filename.txt`  - (outputs link urls to './path/to/filename.txt')]  
+    `$ anime-dl -f path/to/directory/`    - (outputs link urls to './path/to/directory/anime_name.txt')]  
 
-    (Empty response gets all episodes, '-1' exits)
+  (If user chooses to DOWNLOAD videos)  
 
-    Total number of Episodes - 64  (1-64)
-    Episodes: -1
-```
+    `$ 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/')]  
 
 
 ### Specifying Episodes: 
 When the '-a' option is not provided, the app asks for 'Episodes' after retrieving the user's anime choice.  
 The user can provide induvidual space-seperated episodes.
 The user can also provide multiple space-seperated ranges with each range having the format 'start-end'.  
-Below are a few examples (assuming anime has more than 18 episodes).  
+Below are a few examples (assuming anime below has more than 18 episodes).  
     `Episodes: 2 4 5` - Retrieves details for episodes 2, 4 and 5  
     `Episodes: 4-8` - Retrieves details for episodes 4 to 8  
     `Episodes: 8-l` - Retrieves details for episodes 8 to the last episode  
     `Episodes: 2 9-13 18-l` - Retrieves details for episodes 2, 9 to 13 and 18 to end 
 
 ### Other options
-Run `$ anime_dl -h` for the list of all options. 
+Run `$ anime-dl -h` for the list of all options. 
 
 ## Limitations
 The page being scraped from, "animeheaven.eu", only allows a certain number of page views per day (>150, <300).
-Once that limit is exceeded, you will have to change networks or try again in 24 hours.
-
+Once that limit is exceeded, you will have to change networks or try again the next day.
 
 
 ## License

data/anime_dl.gemspec

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

data/bin/{anime_dl → anime-dl}

@@ -4,11 +4,10 @@ require "optparse"
 require "fileutils"
 
 # APP OPTIONS
-options = { option: "link", episode: true, file: nil, quiet: false }
+options = { episode: true, file: nil, quiet: false }
 help_statements = {
-  option: %Q[Option (default: "link"). Values: "l" (or) "link", "d" (or) "download"],
   episode: %Q[Prevents the app from asking for an Episodes prompt. Gets detals for all episodes.],
-  file: %Q[Provide location to store extracted details. Exits if path does not exist. (Usage Examples below).],
+  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.],
   version: %Q[Prints version and exits.]
@@ -20,27 +19,18 @@ ARGV.options do |opts|
   opts.separator ""
   opts.separator "User can either download episodes or get links to video sources of episodes of a particular anime."
   opts.separator "On running the command the program prompts the user for a search query and prints a list of search results."
-  opts.separator "The user can then choose a particular anime and choose which episodes to scrape."
+  opts.separator "On choosing a particular anime, the user can then choose to get links or download videos and choose which episodes to scrape."
   opts.separator ""
   opts.separator "Links: "
-  opts.separator "  To output links to a file, provide the path to a file as the last argument."
+  opts.separator "  To output links to a file, provide the path to a file with '--file'."
   opts.separator "  If argument is a directory, a new text file will be created in that directory."
+  opts.separator "  If '--file' is not provided, links are printed on the command line."
   opts.separator "Downloads: "
-  opts.separator "  To download videos to particular directory, specify the directory as the last argument."
-  opts.separator "  If no directory is specified the videos are downloaded to ~/AnimeDL/anime_name/"
+  opts.separator "  To download videos to particular directory, specify the directory with '--file'."
+  opts.separator "  If no directory is specified the videos are downloaded to ./anime_name/"
   opts.separator ""
   opts.separator "Options:"
 
-  opts.on("-o option", "--option=option", help_statements[:option]) do |option|
-    unless (['l', 'link', 'd', 'download'].include? option)
-      puts "Invalid argument to --option"
-      puts %Q[Valid options: "l" (or) "link", "d" (or) "download"]
-      exit
-    end
-
-    options[:option] = option
-  end
-
   opts.on("-a", "--all", help_statements[:episode]) do
     options[:episode] = false
   end
@@ -55,7 +45,7 @@ ARGV.options do |opts|
 
 
   opts.on( "-v", "--version", help_statements[:version]) do
-    puts "AnimeDL: 0.1.5"
+    puts "AnimeDL: Version 0.1.8"
     exit
   end
 
@@ -65,82 +55,35 @@ ARGV.options do |opts|
   end
 
   opts.separator ""
-  opts.separator "Examples:"
-  opts.separator %Q[  `$ anime_dl`                                        (outputs link urls on the terminal)]
-  opts.separator %Q[  `$ anime_dl -f rel/path/to/filename.txt`            (outputs link urls to 'rel/path/to/filename.txt')]
-  opts.separator %Q[  `$ anime_dl -o link -f rel/path/to/directory/`      (outputs link urls to 'rel/path/to/directory/anime_name.txt')]
-  opts.separator %Q[  `$ anime_dl -o download`                            (downloads videos to './anime_name/')]
-  opts.separator %Q[  `$ anime_dl -o download -f .`                       (downloads videos to './')]
-  opts.separator %Q[  `$ anime_dl -o d -f /abs/path/to/directory`         (downloads videos to '/abs/path/to/directory/anime_name/')]
-  opts.separator %Q[  `$ anime_dl -o download -f /abs/path/to/directory/` (downloads videos to '/abs/path/to/directory/anime_name/')]
+  opts.separator "Example Usage:"
+  opts.separator "(If user chooses to scrape LINKS)"
+  opts.separator %Q[  `$ anime-dl`                          (outputs link urls on the terminal)]
+  opts.separator %Q[  `$ anime-dl -f path/to/filename.txt`  (outputs link urls to './path/to/filename.txt')]
+  opts.separator %Q[  `$ anime-dl -f path/to/directory/`    (outputs link urls to './path/to/directory/anime_name.txt')]
+  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 ""
 
-  opts.separator "Example App Usage:"
-  opts.separator "`anime_dl -q`"
-  opts.separator "  Enter Search Query: fullmetal alchemist b"
-  opts.separator "  0. (Exit)"
-  opts.separator "  1. Fullmetal Alchemist Brotherhood Dubbed | Hagane no Renkinjutsushi (2009) Dubbed"
-  opts.separator "  2. Fullmetal Alchemist Brotherhood | Hagane no Renkinjutsushi (2009)"
-  opts.separator "  3. (Enter new Search Query)"
-  opts.separator ""
-  opts.separator "  Choice: 4"
-  opts.separator "  (Empty response gets all episodes, '-1' to exit)."
-  opts.separator "  Total number of Episodes - 20  (0-19)"
-  opts.separator "  Episodes: -1"
-
-  opts.separator ""
-  opts.separator ""
-  opts.separator "When the '-a' option is not provided, the app asks for 'Episodes' after retrieving the user's anime choice."
-  opts.separator "The user can provide induvidual space-seperated episodes."
-  opts.separator "The user can also provide multiple space-seperated ranges with each range having the format 'start-end'."
-  opts.separator "Below are a few examples (assuming anime has more than 18 episodes)."
-  opts.separator %Q[  `Episodes: 2 4 5` - Retrieves details for episodes 2, 4 and 5]
-  opts.separator %Q[  `Episodes: 4-8` - Retrieves details for episodes 4 to 8]
-  opts.separator %Q[  `Episodes: 8-l` - Retrieves details for episodes 8 to the last episode]
-  opts.separator %Q[  `Episodes: 2 9-13 18-l` - Retrieves details for episodes 2, 9 to 13 and 18 to end]
+  opts.separator "Specifying Episodes:"
+  opts.separator "(Run the app WITHOUT the '--quiet' option to allow it to provide explanations and examples for specifying episodes)"
   opts.separator ""
   opts.separator "NOTE: "
   opts.separator "The page being scraped from, \"animeheaven.eu\", only allows a certain number of page views per day (>150, <300)."
-  opts.separator "Once that limit is exceeded, you will have to change networks or try again in 24 hours."
+  opts.separator "Once that limit is exceeded, you will have to change networks or try again the next day."
 
   begin
     opts.parse!
-  rescue OptionParser::MissingArgument, OptionParser::InvalidArgument => error
-    puts "Error: #{error}"
-    puts "Enter `anime_dl - h` for usage options"
-    exit
   rescue => error
     puts "Error: #{error}"
-    puts "Enter `anime_dl - h` for usage options"
+    puts "Enter `anime-dl - h` for usage options"
     exit
   end
 end
 
-
-# File Check
-if (options[:file])
-
-  if (options[:option][0] == "l")
-    if ( File.directory?(options[:file]) )
-      unless (File.exists?(options[:file]))
-        puts "Directory does not exist"
-        exit
-      end
-    elsif ( !File.exists?( File.split(options[:file])[0] ) )
-      puts "Location does not exist"
-      exit
-    end
-
-  elsif ( File.file?(options[:file]) )
-    puts "Argument is not a directory"
-    puts "For --option=download , argument to --file must be a directory"
-    exit
-  elsif ( !File.exists?(options[:file]) )
-    puts "Creating New Directory #{options[:file]}"
-    FileUtils.mkdir_p(options[:file])
-  end
-
-end
+ARGV.clear
 
 
 # New Instance
@@ -149,20 +92,25 @@ instance = AnimeDL::AnimeHeaven.new
 # App Prompts/Help Text
 unless (options[:quiet])
   $user_prompts = {
+    quiet: "(Note: Run app with '-q' or '--quiet' to suppress help messages)\n(Run anime-dl -h for more options)\n\n",
+    scrape_option: "\nShould the app get links or download episodes? (Empty response will download episodes)\n",
     search: "\nNo Results Found. Please check your search query.\n(Its worth noting that AnimeHeaven does not have some old anime)\n",
     episodes: "\nEnter the desired episodes.\nYou can provide induvidual space-seperated episodes.\n" +
               "Or you can also provide multiple space-seperated ranges with each range having the format 'start-end'.\n" +
-              "Examples (assuming anime has more than 18 episodes):\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: 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" +
+              "(Running app with '-a' or '--all' will automatically retrieve all episodes)\n" +
               "(Enter empty response to get all episodes, '-1' exits)\n\n"
   }
 else
   $user_prompts = {
+    quiet: nil,
+    scrape_option: "\nLinks/Downloads?\n",
     search: "No Results Found.\n",
-    episodes: "\n(Empty response gets all episodes, '-1' exits).\n"
+    episodes: "\nSelect Episodes. (Empty response gets all episodes, '-1' exits).\n"
   }
 end
 
@@ -182,18 +130,16 @@ def output(results)
 end
 
 
-# Option Check
-def check(input, max)
-  exit  if (input == "0")
-  return 1  if ( (1..(max + 1)).include? input.to_i )
-
+# Choice Check
+def check(input, arr)
+  return 1  if ( arr.include? input )
   puts "Invalid input.\n\n"
 end
 
 
 # Write links to file
 def file_write(file, links, choice)
-  details = ""
+  details = choice.content.split(" | ")[0] + "\n\n"
   puts links.pop.link  if (links.last.number == nil)
   exit  if links.empty?
 
@@ -204,11 +150,11 @@ def file_write(file, links, choice)
   puts "Writing"
   if ( File.directory?(file) )
     file = File.new( File.join(file, choice.content.split(" | ")[0] + ".txt"), "a+" )
-    file.write(details + "\n")
+    file.write(details + "\n\n")
     file.close
   else
     file = File.new(file, "a+")
-    file.write(details + "\n")
+    file.write(details + "\n\n")
     file.close
   end
 end
@@ -216,6 +162,9 @@ end
 
 
 # APP LOGIC
+# Quiet Prompt
+print $user_prompts[:quiet]
+
 # Search
 while true
   print "Enter Search Query: "
@@ -229,7 +178,8 @@ while true
   while true
     print "Choice: "
     input = gets.strip
-    break  if (check(input, results.length) == 1)
+    exit  if (input == "0")
+    break  if (check(input.to_i, 1..(results.length + 1)) == 1)
   end
 
   # Re-enter search query
@@ -239,15 +189,62 @@ end
 
 # Choice as Nokogiri Element
 choice = results[input.to_i - 1]
+puts "Anime: " + choice.content + "\n"
+
+# Choice for link or download
+puts $user_prompts[:scrape_option]
+while true
+  print "Option (l/d): "
+  scrape_option = gets.strip
+  break  if ( check(scrape_option, ['l', 'd', ""]) == 1 )
+end
+
+scrape_option == 'd'  if (scrape_option == "")
+
+# File Check
+begin
+  if (options[:file])
+
+    if (scrape_option == "l")
+      if ( !File.exists?(options[:file]) )
+        puts "\n"
+
+        if ( options[:file][-1] == "/" )
+          puts "Creating directory '#{options[:file]}'"
+          FileUtils.mkdir_p(options[:file])
+        else 
+          puts "Creating directory '#{ File.split(options[:file])[0] }'"
+          FileUtils.mkdir_p( File.split(options[:file])[0] )
+        end
+      end
+
+    elsif ( File.file?(options[:file]) )
+      puts "\n"
+      puts "Argument is not a directory"
+      puts "For --option=download , argument to --file must be a directory"
+      exit
+    elsif ( !File.exists?(options[:file]) )
+      puts "\n"
+      puts "Creating directory '#{options[:file]}'"
+      FileUtils.mkdir_p(options[:file])
+    end
+
+  end
+rescue => error
+  puts "\nDirectory creation failed."
+  puts error
+  exit
+end
 
 # Range
 range = []
 if (options[:episode])
+  first, last = instance.getTotal(choice)
+
   puts "\n"
   print $user_prompts[:episodes]
   puts "\n"
 
-  first, last = instance.getTotal(choice)
   puts "Total number of Episodes - #{last - first + 1}  (#{first}-#{last})"
   print "Episodes: "
   range = gets.strip
@@ -258,9 +255,8 @@ end
 
 
 # Data Retrieval
-puts "Scraping: " + choice.content + "\n\n"
 
-if ( options[:option][0] == 'l' && !options[:file])
+if ( scrape_option == 'l' && !options[:file])
   to_print = true
 else 
   to_print = false
@@ -268,10 +264,10 @@ end
 
 # Links
 links = instance.getLinks(choice, range, options[:quiet], to_print)
-file_write(options[:file], links, choice)   if (options[:file] && options[:option][0] == 'l')
+file_write(options[:file], links, choice)   if (options[:file] && scrape_option == 'l')
 
 # Downloads
-if ( options[:option][0] == 'd' )
+if ( scrape_option == 'd' )
   if (options[:file] == nil)
     options[:file] = choice.content.split(" | ")[0]
     Dir.mkdir( options[:file] )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: AnimeDL
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Anirudh Sundar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
@@ -27,7 +27,7 @@ dependencies:
 description: 
 email: anirudhsundar@hotmail.com
 executables:
-- anime_dl
+- anime-dl
 extensions: []
 extra_rdoc_files: []
 files:
@@ -35,7 +35,7 @@ files:
 - LICENSE.txt
 - README.md
 - anime_dl.gemspec
-- bin/anime_dl
+- bin/anime-dl
 - fmab_anime_dl.jpg
 - lib/anime_dl.rb
 - lib/anime_dl/anime_heaven.rb