panchira 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b6ab5f09a68a55d7fa54720b6ed5544605c5b4fa25ff839583058ac3af5611b
-  data.tar.gz: 22814f2437ac515c59d22a634c4709212eb639735a831157b7a64375559c1cf1
+  metadata.gz: 6efe3f2eddf6984db580aebed3d142e7ba8cab9df8b5f69742b9692d62b83dc5
+  data.tar.gz: d86faa63aeb5cf4b963a420575f8522dbd4f079f91af23b03e0ff8e79dc026fc
 SHA512:
-  metadata.gz: a2a42f6023db6ce19d076079044c6fd88e49870478590d89ad25810dd3b72e72439627b416bd3d439d78ab8eaa72683746617fe565f441e69a758811e4b50023
-  data.tar.gz: 6f4573bf646ea21d9d5887ee67a1e95e275e6b1de6d152d4c096c7b8a4e70fa29409143a8a00af0c32f6a1e023f4b0a5c84a30d50fd789dc5f6822cb161cd0ed
+  metadata.gz: 0ab350c44ea6e8374926f4cea197320bdfb65b5f243c70f3943a775e32b8bc75c26910380326face1fc1a157d03b78f8d81fe5f5eda26b7516d55d13edda3ec9
+  data.tar.gz: 272f6e3deea2b6e0e1f678c32e1e3e00dddb10d2fa74626ff6e5fe5787864ec76f054d1679448e0b174ba34aba600d1c923606336690f2a7f7b7d60353054668

data/.github/workflows/ruby.yml

@@ -16,7 +16,7 @@ on:
 jobs:
   test:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
 
     steps:
     - uses: actions/checkout@v2

data/CHANGELOG.md

@@ -4,10 +4,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## 1.3.3 - 2021-07-25
+### Added
+- Added Support for Iwara.
+
+### Fixed
+- Fixed an issue where DLsite Resolver was retrieving wrong tags.
+
 ## 1.3.2 - 2021-05-23
 ### Fixed
-- Fixed an issue where Fanza Resolver was retrieving incorrect cannonical URLs from meta tags.
-- Fixed an issue where Narou Resolver retrieved wrong descriptions from meta tags.
+- Fixed an issue where Fanza Resolver was retrieving incorrect canonical URLs.
+- Fixed an issue where Narou Resolver was retrieving wrong descriptions.
 
 ### Changed
 - Updated dependencies.
@@ -79,6 +86,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Released Panchira gem. At this time we can parse only 5 websites.
 
+[1.3.2]: https://github.com/nuita/panchira/releases/tag/v1.3.2
 [1.3.1]: https://github.com/nuita/panchira/releases/tag/v1.3.1
 [1.3.0]: https://github.com/nuita/panchira/releases/tag/v1.3.0
 [1.2.0]: https://github.com/nuita/panchira/releases/tag/v1.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    panchira (1.3.2)
+    panchira (1.3.3)
       fastimage (~> 2.1.7)
       nokogiri (>= 1.10.9, < 1.12.0)
 

data/README.md

@@ -6,7 +6,7 @@
 
 Due to some legal or ethical issues, most hentai and NSFW platforms don't clarify their content on meta tags. As a result, most hentai platforms are rendered poorly on the card previews on social media.
 
-To solve this issue, Panchira is made to parse correct and uncensored metadata from such web platforms (at this time we cover **DLSite, Komiflo, Melonbooks, Nijie, Pixiv, Shousetsuka ni narou, Fanza and Twitter**).
+To solve this issue, Panchira is made to parse correct and uncensored metadata from such web platforms (at this time we cover **DLSite, Komiflo, Melonbooks, Nijie, Pixiv, Shousetsuka ni narou, Fanza, Iwara and Twitter**).
 
 If you need card previews of hentai on your web application, but can't get them with simply parsing metatags, then it is time for Panchira.
 

data/lib/panchira/resolvers/dlsite_resolver.rb

@@ -39,7 +39,13 @@ module Panchira
       end
 
       def parse_tags
-        @page.css('.main_genre').children.children.map(&:text)
+        @page.css('table[id*="work_"] tr').each do |tr|
+          next unless tr.css('th').text =~ /ジャンル/
+
+          return tr.css('td a').map do |node|
+            node.text.strip
+          end
+        end
       end
   end
 

data/lib/panchira/resolvers/iwara_resolver.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Panchira
+  class IwaraResolver < Resolver
+    URL_REGEXP = /(www|ecchi)\.iwara\.tv\//.freeze
+
+    private
+      def parse_title
+        super.split(' | ')[0]
+      end
+
+      def parse_image_url
+        url = @page.at_css('#video-player')&.attributes['poster']&.value
+        'https:' + url if url
+      end
+
+      def parse_author
+        @page.at_css('.node-info .username')&.children&.[](0)&.text
+      end
+
+      def parse_tags
+        @page.css('.node-info .field-item').map { |e| e.children&.text }
+      end
+
+      def cookie
+        'show_adult=1'
+      end
+
+      def parse_canonical_url
+        @url # canonical has relative path. ignore it
+      end
+  end
+
+  ::Panchira::Extensions.register(Panchira::IwaraResolver)
+end

data/lib/panchira/resolvers/narou_resolver.rb

@@ -37,6 +37,11 @@ module Panchira
         # つらい。
         @desc&.xpath('//*[@id="noveltable1"]/tr[3]')&.text&.split("\n\n\n")&.dig(1)&.split(' ')
       end
+
+      # og:urlで指定されたncode.syosetu.com/~~~にアクセスすると301で戻されるので何もしない
+      def parse_canonical_url
+        @url
+      end
     end
 
     class NcodeResolver < Resolver
@@ -63,6 +68,11 @@ module Panchira
         # めっちゃつらい。
         @desc&.xpath('//*[@id="noveltable1"]/tr[3]')&.text&.split("\n\n\n")&.dig(1)&.delete("\u00A0")&.split(' ')&.grep_v('')
       end
+
+      # og:urlで指定されたncode.syosetu.com/~~~にアクセスすると301で戻されるので何もしない
+      def parse_canonical_url
+        @url
+      end
     end
   end
 

data/lib/panchira/resolvers/resolver.rb

@@ -67,17 +67,20 @@ module Panchira
         # fetch page and refresh canonical_url until canonical_url converges.
         loop do
           url_in_res = @page.css('//link[rel="canonical"]/@href').to_s
+          if url_in_res.empty?
+            url_in_res = @page.css('//meta[property="og:url"]/@content').to_s
+          end
 
           if url_in_res.empty?
             return history.last || @url
-          else
-            if history.include?(url_in_res) || history.length > 5
-              return url_in_res
-            else
-              history.push(url_in_res)
-              @page = fetch_page(url_in_res)
-            end
           end
+
+          if history.include?(url_in_res) || history.length > 5
+            return url_in_res
+          end
+
+          history.push(url_in_res)
+          @page = fetch_page(url_in_res)
         end
       end
 

data/lib/panchira/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Panchira
-  VERSION = '1.3.2'
+  VERSION = '1.3.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: panchira
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - kyp
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -141,6 +141,7 @@ files:
 - lib/panchira/resolvers/dlsite_resolver.rb
 - lib/panchira/resolvers/fanza_resolver.rb
 - lib/panchira/resolvers/image_resolver.rb
+- lib/panchira/resolvers/iwara_resolver.rb
 - lib/panchira/resolvers/komiflo_resolver.rb
 - lib/panchira/resolvers/melonbooks_resolver.rb
 - lib/panchira/resolvers/narou_resolver.rb