cafe_basics 0.1.35 → 0.1.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de85aa69c00be82b5906f50fecffbe4751fee24d8e3e73c52b3fceb575bc1111
-  data.tar.gz: e0b12494aa5e33797f849c7540134dd2fe3e7d4e061e8b9cc2b2381285f18ede
+  metadata.gz: 56e8380865c93fed4f0e471b0fb5d7d20424052e54f3f11154598d80268d3b2b
+  data.tar.gz: a4cde618f660a0b07aa9e1223d67711d3b9f34704cb6d7f00d9033d5dda2b3f7
 SHA512:
-  metadata.gz: 7f3216c8676cf48271abcea2fe38f84881f49b4d099d2dd419f76f9b5fc0e0a90dc779acc2be11704bd784d9042df4bbf987d07e844210a0cb8136315e96adcc
-  data.tar.gz: 35b7008ab9fdc3f90ddeb90bc0a6211c6fd5205cb621101538f1c5c9854f07ca314110a4f1ce94a580565e3e8b6785753f34a6296f483840dc0e4d95fc90985c
+  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
 
@@ -2118,18 +2179,40 @@ class Wordpress
             image_filter()
         end
 
-        insert_image_text1 = ''
-        insert_image_text2 = ''
         if @data['이미지설정']['글자삽입1'].checked?
-            insert_image_text1 = @data['이미지설정']['이미지글자1'].sample
+            if @data['이미지설정']['이미지글자1'].length == 0
+            image_text_path1 = ''
+            else
+            if @data['이미지설정']['글자랜덤'].checked?
+            image_text_path1 = @data['이미지설정']['이미지글자1'].sample
+            else
+            image_text_path1 = @data['이미지설정']['이미지글자1'][@image_text_soon1]
+            @image_text_soon1 += 1
+            if @image_text_soon1 > @data['이미지설정']['이미지글자1'].length - 1
+            @image_text_soon1 = 0
+            end
+            end
+            end
         end
 
         if @data['이미지설정']['글자삽입2'].checked?
-            insert_image_text2 = @data['이미지설정']['이미지글자2'].sample
+            if @data['이미지설정']['이미지글자2'].length == 0
+            image_text_path2 = ''
+            else
+            if @data['이미지설정']['글자랜덤'].checked?
+            image_text_path2 = @data['이미지설정']['이미지글자2'].sample
+            else
+            image_text_path2 = @data['이미지설정']['이미지글자2'][@image_text_soon2]
+            @image_text_soon2 += 1
+            if @image_text_soon2 > @data['이미지설정']['이미지글자2'].length - 1
+            @image_text_soon2 = 0
+            end
+            end
+            end
         end
-
+            
         if @data['이미지설정']['글자삽입1'].checked? or @data['이미지설정']['글자삽입2'].checked?
-            image_text(insert_image_text1, insert_image_text2)
+            image_text(image_text_path1, image_text_path2)
         end
 
         if @data['이미지설정']['테두리사용'].checked?
@@ -2193,6 +2276,8 @@ class Wordpress
         title_soon = 0
         keyword_soon = 0
         content_soon = 0
+        @image_text_soon1 = 0
+        @image_text_soon2 = 0
         @my_ip = 'init'
         @image_counter = 0
         @inumber2 = 0
@@ -4427,9 +4512,30 @@ class Wordpress
                                         top 1
                                         left 6
                                     }
-                                    @data['이미지설정']['필터사용'] = checkbox('필터사용(색상 사진 적용불가)'){
+                                    @data['이미지설정']['글자순서'] = checkbox('글자 리스트 순서대로 사용'){
                                         top 2
                                         left 0
+                                        on_toggled{
+                                            if @data['이미지설정']['글자순서'].checked?
+                                                @data['이미지설정']['글자랜덤'].checked = false
+                                            end
+                                            }
+                                    }
+
+                                    @data['이미지설정']['글자랜덤'] = checkbox('글자 리스트 랜덤으로 사용'){
+                                        top 2
+                                        left 1
+                                        on_toggled{
+                                            if @data['이미지설정']['글자랜덤'].checked?
+                                                @data['이미지설정']['글자순서'].checked = false
+                                            end
+                                        }
+                                    }
+
+
+                                    @data['이미지설정']['필터사용'] = checkbox('필터사용(색상 사진 적용불가)'){
+                                        top 2
+                                        left 2
                                     }
                                     @data['이미지설정']['테두리사용'] = checkbox('테두리 사용'){
                                         top 3
@@ -5340,6 +5446,7 @@ class Wordpress
             @data['포스트설정']['자동출처 사용'].checked = false
             @data['포스트설정']['CCL사용'].checked = false
             @data['포스트설정']['인용구랜덤'].checked = true
+            @data['이미지설정']['글자순서'].checked = true
         }.show
     end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: cafe_basics
 version: !ruby/object:Gem::Version
-  version: 0.1.35
+  version: 0.1.37
 platform: ruby
 authors:
 - zon
 bindir: bin
 cert_chain: []
-date: 2025-05-22 00:00:00.000000000 Z
+date: 2025-05-23 00:00:00.000000000 Z
 dependencies: []
 description: File to Clipboard gem
 email: mymin26@naver.com