cafe_basics_duo 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed29b474605d5e69da6839887f2098f9440775ec05d0702341b143138a0c654b
-  data.tar.gz: bdb4ed6fee966c5f02f4089f2ad2f60858bcd3e2cc4d778848130cc642fd355c
+  metadata.gz: 0ea656b168468dcf680e00ba06a615aca79d3e3748eb33cfa1bee9f90923c29d
+  data.tar.gz: 6f892b0c8c816bb68af4ffd3aac73f04327c8934d90af79cd77cda7e67718b44
 SHA512:
-  metadata.gz: a191bbefbfbfc7a7f1a46a6de3578da551839430a635d0add360e8e6572c076f1ace730a3fa45ddbe70e62f31b1adf1dc52ec369b0f56682afc260639231b4bf
-  data.tar.gz: 65dc2ff26d0ffc33ace43524d2c729a554aae460a5e11241865cdb089142cad4a277905226905993b143b84f55aefbd7e53935948ffb4b6f295f733eed3848c9
+  metadata.gz: b30ffce6f681d19d52e248866ac695f991f7e39d130dfb329c9d88cc731f23b879a9d99929a8c53675abce0f14f1f9000efacd6a35cb046973dad4030055ae7b
+  data.tar.gz: 27490fd24522ec64ffb0a47c8cbab371c172ed272764e5ac959e1b743c49574b72ddcc5418e29e3789cc6623d9be6d36d4232637a2e6aa85104fa6cce7f6d879

data/lib/cafe_basics_duo.rb

@@ -17,6 +17,7 @@ require 'cgi'
 require 'digest'
 require 'auto_click'
 require 'rainbow/refinement'
+require 'httpclient'
 include AutoClickMethods
 using Rainbow
 include Glimmer
@@ -2031,21 +2032,81 @@ class Wordpress
 
     
 
-    def auto_image
+    def auto_image(keyword = nil)
+        keyword ||= @keyword
+        puts "키워드: #{keyword}"
+
+        client = HTTPClient.new
+        client.default_header = {
+            'User-Agent' => 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 '\
+                            '(KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36',
+            'Accept' => 'application/json, text/javascript, */*; q=0.01',
+            'Accept-Language' => 'en-US,en;q=0.9',
+            'Referer' => "https://unsplash.com/s/photos/#{URI.encode_www_form_component(keyword)}",
+            'X-Requested-With' => 'XMLHttpRequest'
+        }
+
+        retry_count = 0
+        max_retries = 10
+        results = []
+
         begin
             page = rand(1..15)
-            http = HTTP.get('https://unsplash.com/napi/photos?per_page=12&page='+page.to_s)
-            json = JSON.parse(http.to_s)
-            mm = Array.new
-            json.each do |i|
-                mm << i['urls']['full']
+            url = "https://unsplash.com/napi/search/photos?query=#{URI.encode_www_form_component(keyword)}&page=#{page}&per_page=20"
+            puts "Request URL: #{url}"
+            res = client.get(url)
+
+            unless res.status == 200
+            puts "HTTP Error: #{res.status}"
+            raise "HTTP Error"
             end
-            url = mm.sample
-            Down.download(url, destination: "./image/memory.png")
-        rescue
-            puts 'auto_image 일시적 error 5초후 제시도...'
-            sleep(5)
+
+            json = JSON.parse(res.body)
+            results = json['results']
+            mm = []
+
+            results.each do |photo|
+            full_url = photo.dig('urls', 'full').to_s
+            regular_url = photo.dig('urls', 'regular').to_s
+
+            if full_url.start_with?("https://images.unsplash.com/photo-") &&
+                regular_url.include?("1080")
+                mm << full_url
+            end
+            end
+
+            if mm.empty?
+            raise "No matching image"
+            end
+
+            selected_url = mm.sample
+            Down.download(selected_url, destination: "./image/memory.png")
+            puts "이미지 다운로드 완료: #{selected_url}"
+
+        rescue => e
+            retry_count += 1
+            puts "auto_image 에러: #{e.message} (재시도 #{retry_count}/#{max_retries})"
+            sleep(3)
+            if retry_count < max_retries
             retry
+            else
+            puts "최대 재시도 초과. 조건 무시하고 랜덤 이미지 다운로드 시도..."
+
+            if results && !results.empty?
+                random_photo = results.sample
+                fallback_url = random_photo.dig('urls', 'full')
+                if fallback_url
+                Down.download(fallback_url, destination: "./image/memory.png")
+                puts "랜덤 이미지 다운로드 완료: #{fallback_url}"
+                else
+                puts "랜덤 이미지 URL을 찾을 수 없습니다. 단색 배경 이미지 생성합니다."
+                color_image
+                end
+            else
+                puts "이미지 결과가 없어 다운로드할 수 없습니다. 단색 배경 이미지 생성합니다."
+                color_image
+            end
+            end
         end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cafe_basics_duo
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - zon