cafe_basics 0.1.36 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23d6859bd69d4f65acca974255b9c01f40d8b4fcd232adae4b8aa5c12f21fe9b
-  data.tar.gz: 388cd66278320bc004cc1421e184aff26f6925da0853ebbb9fb792623e308c9b
+  metadata.gz: 56e8380865c93fed4f0e471b0fb5d7d20424052e54f3f11154598d80268d3b2b
+  data.tar.gz: a4cde618f660a0b07aa9e1223d67711d3b9f34704cb6d7f00d9033d5dda2b3f7
 SHA512:
-  metadata.gz: b786be3d1c94cf8343fd6a609afad2d457c9705f830d3c65cd629dad62084fa1706814b367ca7478b2ba4832890661041950e93dcc304b462adfc29c148a8a23
-  data.tar.gz: 1b192a2a4467afb78bfb8446e7637b3dd5b4749236f835a1aec0d19c128ba1af87e4f75e06dd61bd598249e5d381ba5ae00e40298998eba6e2867c810867f100
+  metadata.gz: 4d5750348d5784273487f9911c27c833538613ee4c85bc1e75e591af311c703347f557945cba197ef26783f377a4c0e0e89a5241c45b416e45b2dc22d154fcb7
+  data.tar.gz: 4a20d7f82b068c0ba7be293347175fb0c057429a32251825619fb77602229900a8ecfa7a7b478356934a9adf1d860e4bac4565c7bae0c3eb2f22162f54b81d6a

data/lib/cafe_basics.rb

@@ -17,6 +17,7 @@ require 'cgi'
 require 'digest'
 require 'auto_click'
 require 'rainbow/refinement'
+require 'httpclient'
 include AutoClickMethods
 using Rainbow
 include Glimmer
@@ -1964,21 +1965,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
 version: !ruby/object:Gem::Version
-  version: 0.1.36
+  version: 0.1.37
 platform: ruby
 authors:
 - zon