wp_posting_duo 0.0.2 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 196d20faaf24c699f6e7471bea38f86da11fb663a06af776e3d3e982842a4242
-  data.tar.gz: c81d7137659a6e91ef9d8689cb195723a3a9acb1831903f31e5b31882ee31acf
+  metadata.gz: 47717ece00cb608e31ccc7f3a77dfa14d31f3e9bbdc324c4265b4d3fe2792b07
+  data.tar.gz: ac8078e3de95f30eae0ec01ee3a3916623be1b2cb0f97f2c353ebc87f38603a4
 SHA512:
-  metadata.gz: 2c758397e6b8cecdc794fdb73d4ae45c73760569a5b0ae08cd204ba1b31404a7c09711e89ac993ae3a92cdff594a988cb903a074c76db93f9be4b389635c4a77
-  data.tar.gz: f4bf9c0349474a9ba7079b0571575f89ec1295ff3a7979e04d7957ed9346eccdc9038b9c8daf21047d5953af16fab37985a2ecc12fb24e34388df4dd5aac6855
+  metadata.gz: 17b374d7691fe13d88491bd385ea8a3aec057dc968b47b22e8c92cf6e7978762ca2aa50bb8ef8460b5748428ec40613ec6165863647048c5bb4f57384fb28816
+  data.tar.gz: ca106a19a91650171725c16058fc6fe076dcccacd66536a6cc7eb9100d31f1b5f00afc9fbe48ea21b002e2d1d6d110bc576642e95404bc4836e6d4ffc3e81d21

data/lib/wp_posting_duo.rb

@@ -11,6 +11,7 @@ require 'open3'
 require 'zlib'
 require 'stringio'
 require 'timeout'
+require 'httpclient'
 
 class Wordpress
     include Glimmer
@@ -402,24 +403,85 @@ class Wordpress
         return @data2
     end
 
-    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 'image auto download 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
 
+
     def color_image
         color = File.open('./color.ini', 'r', :encoding => 'utf-8').read().split("\n")
         image = Magick::Image.new(740, 740) { |k| k.background_color = color.sample }
@@ -2267,17 +2329,27 @@ class Wordpress
                                     }
                                     button('폴더째로불러오기'){
                                         stretchy false
-                                        on_clicked{
+                                        on_clicked {
                                             path = @data['이미지설정']['폴더경로'].text.to_s.force_encoding('utf-8')
-                                            Dir.entries(@data['이미지설정']['폴더경로'].text.to_s).each do |file|
-                                                if file == '.' or file == '..'
 
-                                                else
-                                                    @data['이미지설정']['이미지'] << [false, file, path+"\\"+file.force_encoding('utf-8')]
+                                            # 경로가 유효한지 확인
+                                            if Dir.exist?(path)
+                                                Dir.entries(path).each do |file|
+                                                    if file == '.' or file == '..'
+                                                        next
+                                                    else
+                                                        # 폴더 내의 파일을 이미지 리스트에 추가
+                                                        @data['이미지설정']['이미지'] << [false, file, path + "\\" + file.force_encoding('utf-8')]
+                                                    end
                                                 end
+
+                                                # 마지막 빈 항목 추가 후 제거 (원래 로직에 맞춰)
+                                                @data['이미지설정']['이미지'] << []
+                                                @data['이미지설정']['이미지'].pop
+                                            else
+                                                # 경로가 존재하지 않으면 경고 메시지 출력
+                                                puts "경로가 존재하지 않습니다: #{path}"
                                             end
-                                            @data['이미지설정']['이미지'] << []
-                                            @data['이미지설정']['이미지'].pop
                                         }
                                     }
                                 }

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wp_posting_duo
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.7
 platform: ruby
 authors:
 - zon
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-30 00:00:00.000000000 Z
+date: 2025-05-23 00:00:00.000000000 Z
 dependencies: []
 description: File to Clipboard gem
 email: mymin26@naver.com
@@ -21,7 +20,6 @@ homepage: ''
 licenses:
 - zon
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -36,8 +34,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: file to clipboard
 test_files: []