video_chat_get 0.1.6 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4c548904d898fbcd56d725e6b7a7dd45df9f8d1a6133f279e0e7edb8a679bac
-  data.tar.gz: 29a668bf9086627306e46d436e93a4d1391cea3467e34791092f6f2332802c03
+  metadata.gz: 72c2d47a8f701af1d42780d9261be02ca29d743800971982bf42b9438ee4bdba
+  data.tar.gz: 90d62278f6cfee916570aad6ebe63acfb4122d9d19eb2f7dba4ef4b153561090
 SHA512:
-  metadata.gz: 2a0123fff8d7773855e61ce3a7ff5aaf4dc94a0b361902ee7c3133ddc5f32897ea2a6092d920f85fffdd67ca129a77860b1a8e07f4232751ab447a4bd53fe6d4
-  data.tar.gz: 9b9e4a2071cd9f3674c66982f378d205d38f6dd814280455444cf521f48dd9fa3a401b5c4269ef2883fa617344bd5214404d8f1ef7e629d2e4dc1507c4fff8d3
+  metadata.gz: 45ed4d022d5b3b40da4ee41103fa589ad4eed996c1ece2afffbfcedfaed0621acac7ffe1555d9b6237d048fe2e5bd5fea06ed128913acedbe665cc1025d6a472
+  data.tar.gz: bafe20e7dbc9b3e67ac1f7d41aebebbde6bb43930e5cd5a300ce8b3babbfc79b408db9428834e0d5de9eaa2e62420f10440d83d518fe662d3e3f4a514957ffe9

data/.circleci/config.yml

@@ -1,4 +1,8 @@
 version: 2.1
+
+orbs:
+  slack: circleci/slack@3.3.0
+
 executors:
    my-executor:
     docker:
@@ -27,13 +31,25 @@ jobs:
       - run: 
            name: bundle exec rake spec
            command: bundle exec rake spec
+      
+      - slack/status:
+          success_message: ':circleci-pass: $CIRCLE_BRANCH のテストが完了しました\n:github_octocat: User：$CIRCLE_USERNAME'
+          failure_message: ':circleci-fail: $CIRCLE_BRANCH のテストが失敗しました\n:github_octocat: User：$CIRCLE_USERNAME'
+          webhook: '${SLACK_WEBHOOK}'
 
 workflows:
   version: 2
-  test-:
+  test:
     jobs:
-      - test:
-         filters:
+      - test
+
+  test_cron: 
+    triggers:
+      - schedule:
+          cron: "0 21 * * 0" 
+          filters:
             branches:
               only:
-                - master
+                - master
+    jobs:
+      - test

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    video_chat_get (0.1.6)
+    video_chat_get (0.1.9)
       httpclient (~> 2.8.3)
       json (~> 2.3.0)
       nokogiri (~> 1.10.9)

data/lib/site_list/twitcasting_analyze.rb

@@ -56,8 +56,8 @@ class Twitcasting_analyze<Video_analyze
 
 
     def chat_page_range()
-        size=@chat_request_body.css(".paging").css("a").size()
-        range=@chat_request_body.css(".paging").css("a")[size-1].text
+        size=@chat_request_body.css(".tw-pager").css("a").size()
+        range=@chat_request_body.css(".tw-pager").css("a")[size-1].text
         return range.to_i
     end
 

data/lib/site_list/youtubelive_analyze.rb

@@ -28,10 +28,24 @@ class Youtubelive_analyze<Video_analyze
 
 
     def videoinfo_get()
+
         videoinfo_respons,videoinfo_status=request_html_parse(@video_url,{})
-        return htmlpage_script_parse(videoinfo_respons,method(:videoinfo_script_cleanup)),videoinfo_status
+
+        videoinfo_respons.search('script').each do |script|
+
+            if script.to_s.include?("window[\"ytInitialData\"]") then
+                return htmlpage_script_parse(script,method(:videoinfo_script_cleanup)),videoinfo_status
+            end
+
+            if script.to_s.include?("var ytInitialData =") then
+                return htmlpage_script_parse(script,method(:videoinfo_script_cleanup_p2)),videoinfo_status
+            end
+
+        end
+
+        return ""
     end
-    
+
 
     def videoinfo_extraction()
 
@@ -53,27 +67,35 @@ class Youtubelive_analyze<Video_analyze
     end
 
 
+    def videoinfo_script_cleanup_p2(script_date)
+        return script_date.split("var ytInitialData =",2)[1].split(";if (window.ytcsi)",2)[0].strip.chomp(";</script>").strip
+    end
+
+
     def chatinfo_script_cleanup(script_date)
-        return script_date.split("=",2)[1].chomp("</script>").strip.chomp(";")
+        return script_date.split('window["ytInitialData"] = ',2)[1].strip.chomp("</script>").strip.chomp(";")
     end
 
 
     def htmlpage_script_parse(respons,callback)
-
-        respons.search('script').each do |script|
-            if script.to_s.include?("window[\"ytInitialData\"]") then
-                script_body=callback.call(script.to_s)
-                script_body=JSON.parse(script_body)
-                return script_body
-            end
-        end
-        return ""
+        script_body=callback.call(respons.to_s)
+        return JSON.parse(script_body)
     end
 
 
     def chat_body_get(next_url, opt={'User-Agent' => @USER_AGENT})
+
         chat_respons,chat_status=request_html_parse(next_url,opt)
-        return htmlpage_script_parse(chat_respons,method(:chatinfo_script_cleanup))
+
+        chat_respons.search('script').each do |script|
+
+            if script.to_s.include?("window[\"ytInitialData\"]") then
+                return htmlpage_script_parse(script,method(:chatinfo_script_cleanup))
+            end
+
+        end
+
+        return ""
     end
     
 
@@ -108,6 +130,6 @@ class Youtubelive_analyze<Video_analyze
 
 
     public :chat_scrape
-    private :videoid_get, :videoinfo_get, :videoinfo_extraction, :htmlpage_script_parse, :videoinfo_script_cleanup, :chatinfo_script_cleanup, :chat_body_get
+    private :videoid_get, :videoinfo_get, :videoinfo_extraction, :htmlpage_script_parse, :videoinfo_script_cleanup, :chatinfo_script_cleanup, :chat_body_get, :videoinfo_script_cleanup_p2
 
 end

data/lib/video_chat_get/version.rb

@@ -1,3 +1,3 @@
 module VideoChatGet
-  VERSION = "0.1.6"
+  VERSION = "0.1.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: video_chat_get
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.9
 platform: ruby
 authors:
 - tf0101
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler