vore 0.2.5-x86_64-linux → 0.2.8-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 538139e45fe5d9fe50429fa066e9b4ae0b818b3ae93cc6ad666c51f4a7c47725
-  data.tar.gz: 3de51893c08f5ba27e4cddafd26f1bba9f18313f76842ce8e4582703ddcccf37
+  metadata.gz: 322dfb93cbfeae7bdf008ed00e0c7ac67affa00d787bd18fc483c3fe583c9215
+  data.tar.gz: d96c5a555ae20af0c4c967539256a528b8914c49ffe3322fc286d3f7684c1355
 SHA512:
-  metadata.gz: c67260e81df507b35ee5b0cf9464b712abc33ebcfc9de31a25618246c536c38f7c4485607d10fc7c5ab88dadcb71971a431bee0a6c81826f40f5af708ce488e3
-  data.tar.gz: 541d743288ede8a86025e21d023efceadd5efd6dff75e5cf82b5f123564243adf40a6301d17185378223cd67395a07d4559dafdcd660c9195a73700df2e752dd
+  metadata.gz: bc438087f76029e4af3a9a28f25ac35800b72022299c63ecb57b3ddfccc96e17c625cad4a02d7e7209d7ac2123efa235163eb5bfa74f75d7105592c83dbc32db
+  data.tar.gz: 2874256c99d57c2269e04b604e716c00f3eba0bb7c287f11a2b96f5f0a58bd812a9d1740da419839c0e1000e96bea36c8f4e4bc130700ddb07293c3c9ecb26e5

data/lib/vore/crawler.rb

@@ -8,6 +8,8 @@ module Vore
     PLATFORM = [:cpu, :os].map { |m| Gem::Platform.local.send(m) }.join("-")
     FILE_SEPERATOR = PLATFORM.include?("windows") ? File::ALT_SEPARATOR : File::SEPARATOR
 
+    attr_reader :output_dir
+
     # Creates a crawler
     # denylist: Sets a denylist filter, allows a regexp, string or array of either to be matched.
     def initialize(denylist: /a^/, sanitization_config: Vole::Configuration::DEFAULT_SANITIZATION_CONFIG)
@@ -26,16 +28,10 @@ module Vore
     end
 
     def scrape_each_page(website, &block)
-      output_dir = "#{@parent_output_dir}/#{website.gsub(/[^a-zA-Z0-9]/, "_").squeeze("_")}"
+      @output_dir = "#{@parent_output_dir}/#{website.gsub(/[^a-zA-Z0-9]/, "_").squeeze("_")}"
       Vore.logger.info("Vore started crawling #{website}, outputting to #{output_dir}")
 
-      output = %x(#{@executable} \
-        --user-agent #{user_agent} \
-        --delay 3500 \
-        --url #{website} \
-        download \
-        -t \
-        #{output_dir})
+      output = run_command(website, @output_dir)
 
       Vore.logger.info("Vore finished crawling #{website}: #{output}")
 
@@ -51,6 +47,7 @@ module Vore
         results[:pages_visited] += 1
 
         html_file = File.read(path).force_encoding("UTF-8")
+        rewritten_html_file = ""
 
         if html_file.empty?
           results[:pages_unprocessed] += 1
@@ -58,7 +55,13 @@ module Vore
           next
         end
 
-        rewritten_html_file = @selma.rewrite(html_file)
+        begin
+          rewritten_html_file = @selma.rewrite(html_file)
+        rescue StandardError => e
+          Vore.logger.warn("Error rewriting #{path}: #{e}")
+          results[:pages_unprocessed] += 1
+          next
+        end
 
         # drops the first 3 parts of the path, which are "tmp", "vore", and the site name
         url_path = path.split(FILE_SEPERATOR)[3..].join("/")
@@ -83,6 +86,16 @@ module Vore
     #   crawl_site(site)
     # end
 
+    def run_command(website, output_dir)
+      %x(#{@executable} \
+        --user-agent #{user_agent} \
+        --delay 3500 \
+        --url #{website} \
+        download \
+        -t \
+        #{output_dir})
+    end
+
     def user_agent
       "'Mozilla/5.0 (compatible; Vore/#{Vore::VERSION}; +https://github.com/gjtorikian/vore)'"
     end

data/lib/vore/handlers/content_extractor.rb

@@ -20,7 +20,6 @@ module Vole
 
       def handle_element(element)
         if element.tag_name == "pre" ||
-            element.tag_name == "code" ||
             element.tag_name == "form" ||
             element.tag_name == "style" ||
             element.tag_name == "noscript" ||

data/lib/vore/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Vore
-  VERSION = "0.2.5"
+  VERSION = "0.2.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vore
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.8
 platform: x86_64-linux
 authors:
 - Garen J. Torikian