dmanga 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89a02baa638bb1e68dfd240f1159a6e04b1b935f
-  data.tar.gz: 033d848cf382353bcf2908be17a432be9ac12863
+  metadata.gz: 2920708055ee2ee6e8bbab751c8b9d8bac78b9eb
+  data.tar.gz: ee8cd018624cd2ce7b693d7fc4a2f60531ba676a
 SHA512:
-  metadata.gz: dbf3d772a0f1baac1e2ed2e9e6decea33e6c4b7133e3d6da5faa3d1676a8e68e4d4f7381551d9edf7b53a18f0df43ec41804b549074885fe41d2742626273110
-  data.tar.gz: 3013f80239e7a61973ec510e4cb7532823d958e2f61c396d07a38898004eb7e3b16524899bca915b0ab08a1f004e3209e5f5d555d9f71be0109de21a0e7c7c69
+  metadata.gz: 63df1d4b6224b416071bbd97ecd146d83b7898f146016a6f6b42a32cdf3c5768b08530f4166b4822481fac91d24eda3e81937d55877ab09684fe548ca9a43819
+  data.tar.gz: 9e4fb2b772307529db17108c1fd3a88a0bebee3e854db2b4fde0c947a2e06fed4a0d2603a84cf7a842b0e5eca3af112da10215a17b1a6326589e3b3d8fed9d20

data/README.md

@@ -19,6 +19,10 @@ e pronto o script fará os downloads do capitulos selecionados.
 
 > `gem update dmanga`
 
+> E para remover a versão anterior:
+
+> `gem clean`
+
 ## Instalação
 
 ### Windows
@@ -42,6 +46,10 @@ Você pode atualizar o script/programa com:
 
 `gem update dmanga`
 
+E para remover a versão anterior:
+
+`gem clean`
+
 Atualize sempre para obter melhoras (desempenho ou novas funcionalidades) e correções de bugs.
 
 ### Linux (debian/ubuntu)
@@ -59,7 +67,11 @@ Pode ser necessário usar o sudo.
 
 Você pode atualizar o script/programa com:
 
-`gem update dmanga`
+`$ gem update dmanga`
+
+E para remover a versão anterior:
+
+`$ gem clean`
 
 Atualize sempre para obter melhoras (desempenho ou novas funcionalidades) e correções de bugs.
 
@@ -83,7 +95,7 @@ Ex2:
 
 Ex3:
 <!--![exemplo de uso](https://github.com/david-endrew/somethings/blob/master/uso_exemplo.gif)-->
-![exemplo de uso](https://github.com/david-endrew/somethings/blob/master/uso_exemplo.gif)
+![exemplo de uso](https://github.com/dkeas/somethings/blob/master/uso_exemplo.gif)
 
 obs: A pasta padrão de destino dos downloads é a pasta Downloads mas 
 você pode dizer ao script a pasta de destino do downloads com a 
@@ -135,7 +147,7 @@ uma das sequintes opções:
 
 3. Para selecionar capitulos especificos:
 
-    `numeroDoCapitulo,numeroDoCapitulo,numeroDoCapitulo`
+    `numeroDoCapitulo,numeroDoCapitulo,numeroDoCapitulo...`
 
     Ex:
 
@@ -166,10 +178,9 @@ Mostra detalhes da execução do programa.
 
 ### Exemplos
 
-`dmanga -d "C:\window\users\images\manga e animes" "One piece"`
+`dmanga -d "C:\Users\usuario\images\manga e animes" "One piece"`
 
-No windows, baixe 'One piece' para
-'C:\window\users\images\manga e animes'
+No windows, baixe 'One piece' para 'C:\Users\usuario\images\manga e animes'
 
 `dmanga "One punch man"`
 

data/dmanga.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
     spec.authors       = ["David Endrew"]
     spec.email         = ["david.edews@gmail.com"]
 
-    spec.summary         = "Download any manga from mangahost.net"
-    spec.description     = "Download any manga from mangahost.net. You can search and " +
+    spec.summary         = "Downloads any manga from mangahost.net"
+    spec.description     = "Downloads any manga from mangahost.net. You can search and " +
         "select any chapter or range of chapters"
     spec.homepage      = "https://github.com/david-endrew/DManga"
     spec.license       = "MIT"

data/lib/dmanga/mangahost_parser.rb

@@ -1,7 +1,7 @@
 # require 'dmanga/site_parser_base'
 require 'dmanga/site_parser_base'
 require 'dmanga/zip_file_generator'
-#require 'pry'
+require 'pry'
 
 module DManga
     class MangaHostParser < SiteParserBase
@@ -54,10 +54,10 @@ module DManga
             # prompt user to select chapters to download
             select_chapters
 
-			# remove simbols that cannot be used in folder's name on windows
-			remove_invalid_simbols(@manga_name)
+            # remove simbols that cannot be used in folder's name on windows
+            remove_invalid_simbols(@manga_name)
             # create manga directory
-			remove_invalid_simbols(@manga_name)
+            remove_invalid_simbols(@manga_name)
             create_dir(@manga_name)
 
             # download selected chapters
@@ -68,7 +68,8 @@ module DManga
                     # binding.pry # DEBUG
                     if resul.empty?
                         page.scan(IMG_LINK_REGEX[1]) do |img|
-                            resul << img[0].gsub!(%r{\\}, "")
+                            #resul << img[0].gsub!(%r{\\}, "")
+                            resul << img[0]
                         end
                     end
 
@@ -80,14 +81,16 @@ module DManga
 
                         #correct créditos img problem
                         correct_image_uri(img)
+
+                        img.gsub!(%r{\\}, "")
                     end
                     resul
                 end
 
                 # create chapter directory relative to manga directory
                 chapter_name = "#{chapter[0]}"
-				# remove simbols that cannot be used in folder's name on windows
-				remove_invalid_simbols chapter_name
+                # remove simbols that cannot be used in folder's name on windows
+                remove_invalid_simbols chapter_name
                 chapter_dir = "#{@manga_name}/#{chapter_name}"
                 create_dir(chapter_dir)
 
@@ -99,17 +102,34 @@ module DManga
         private
         # Due to problems with open-uri and utf-8
         # some chapters' name need to be corrected.
-		# substitute Cap$amptulo for capitulo.
+        # substitute Cap$amptulo for capitulo.
         def correct_chapters_name
             @chapters.each {|chapter| chapter[0].sub!(/[cC]ap.*?tulo/, "capitulo")}
         end
 
+        UNICODE_TABLE = {
+            "\\u00e1" => "\u00e1",
+            "\\u00e9" => "\u00e9",
+            "\\u00ed" => "\u00ed"
+            #'\\u00c1' => "\u00c1" 
+            #'\\u00c1' => "\u00c1" 
+        }
+
         # Due to problems with open-uri and utf-8
         # some images uris need to be corrected.
-		# substitute Cru00e9ditos for Créditos.
+        # substitute Cru00e9ditos for Créditos.
         # one uri at a time
         def correct_image_uri(img_uri)
-            img_uri.sub!(/[cC]r.{2,10}ditos/, "Créditos")
+            #if img_uri =~ /\\u..../i
+            result = img_uri.scan(/\\u..../i) #do |r|
+            #binding.pry
+            result.each do |r|
+                img_uri.sub!(r, UNICODE_TABLE[r.downcase])
+            end
+            #img_uri.gsub!($&, UNICODE_TABLE[$&.downcase])
+            #binding.pry
+            #exit
+            #end
             #img_uri.sub!(/[cC]r.*?ditos/, "Créditos")
         end
     end

data/lib/dmanga/site_parser_base.rb

@@ -3,12 +3,12 @@ require 'dmanga/os'
 require 'ruby-progressbar'
 require 'open-uri'
 require 'addressable/uri'
-# require 'pry'
+#require 'pry'
 # require 'formatador'
 
 module DManga
     class SiteParserBase
-        USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Firefox/45.0"
+        USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0"
 
         attr_accessor :manga_name, :manga_url,
             :chapters, :verbose
@@ -139,11 +139,10 @@ module DManga
             end
         end
 
-        # download images to a path relative to download directory
+        # download images to path relative to Downloads directory
         def imgs_download(chp_path, imgs_urls)
             imgs_urls.each do |url|
-                original_filename =  url.slice(/(?u)(\w|[_-])+\.(png|jpg)/)
-                #original_filename =  url.slice(/(\w|[_-])+\.(png|jpg)/)
+                original_filename =  url.slice(/(?u)(\w|[_-])+\.(png|jpg)/i)
 
                 img_path = [@options.download_dir,
                             chp_path, 
@@ -153,7 +152,7 @@ module DManga
                     DManga::display_feedback "\n#{encoded_url}"
                     pbar = get_progressbar
                     open(
-                        encoded_url,
+                        encoded_url, "User-Agent" => USER_AGENT,
                         :progress_proc => lambda {|s| pbar.increment }
                     ) do |response|
                         if response.status[1] == "OK"
@@ -161,6 +160,8 @@ module DManga
                             File.open(img_path, "wb") do |img| 
                                 img.puts response.read
                             end
+                        else
+                            puts "Error #{reponse.status}"
                         end
                     end
                     puts
@@ -172,7 +173,7 @@ module DManga
         # create a directory relative to downlaod directory
         def create_dir(relative_path)
             absolute_path = [@options.download_dir, relative_path].join(File::SEPARATOR)
-	    DManga::display_feedback "\nCriando diretorio '#{relative_path}' em '#{@options.download_dir}'" if @options.verbose
+            DManga::display_feedback "\nCriando diretorio '#{relative_path}' em '#{@options.download_dir}'" if @options.verbose
             unless Dir.exist? absolute_path
                 Dir.mkdir(absolute_path) 
                 puts if @options.verbose ## just a blank line for prettier output

data/lib/dmanga/version.rb

@@ -1,3 +1,3 @@
 module DManga
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dmanga
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - David Endrew
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-31 00:00:00.000000000 Z
+date: 2017-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
@@ -122,7 +122,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-description: Download any manga from mangahost.net. You can search and select any
+description: Downloads any manga from mangahost.net. You can search and select any
   chapter or range of chapters
 email:
 - david.edews@gmail.com
@@ -173,5 +173,5 @@ rubyforge_project:
 rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
-summary: Download any manga from mangahost.net
+summary: Downloads any manga from mangahost.net
 test_files: []