tiupd 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a41726f93df2db3b90b5d4f502744dfc8f36581b00b094dd2225c86b16bd760b
-  data.tar.gz: 8df09a7a38bac32622624e707d9934eaa87dea1391e73f564aa61b7f9cda5661
+  metadata.gz: 942074dd8b514252a7655879ad002c846169f2756f5790a36b8a45938d61e558
+  data.tar.gz: c4441dfe4cfd351a4405e9004ee5fa929b2154bb922760b8e2e40f0050a8b992
 SHA512:
-  metadata.gz: 7cdacbf16ec6d55f8cf1ebf6fcad6e23bb5c28165fb6eefd318b19cdfd681417537e299b32123f4e1ae5fc3145307214bd191e6465c3e58c7ca2dd9a812a2fc1
-  data.tar.gz: 6ae1ee97f0f4d27bef1bdb5261b115f2db3f7a0bb236128539a78f52eb310ff5f361ef16317ed56aba0a50135c4e5a0681c0f180b6675054b9f411a895c47ae4
+  metadata.gz: b89c1b6c789145e756e2e87bcf66d169012da8851bdf68c8030dbfb17f260903b6785b2fc7e74129cf941d0f23496d5891511aafec89680f89a8b8550c132b1d
+  data.tar.gz: 94f7b4147ac1bf0918904710670c47916c9a40539dd7926fdc8ac0c37499e2d49453ebc7967ec82ffe61cd35b2fb8a4f34229ca3c26afc2de24241d76205cf62

data/lib/tiupd.rb

@@ -14,7 +14,8 @@ require 'crack'
 require 'uri'
 require 'auto_click'
 require 'rainbow/refinement'
-require 'win32ole'	                
+require 'win32ole'
+require 'httpclient'            
 include AutoClickMethods
 using Rainbow
 include Glimmer
@@ -24,7 +25,37 @@ class Naver
     def initialize(data)
         @data = data # Wordpress에서 전달된 data 저장
         @seed = 1
+        kill_selenium_chrome #기존 창 모두 닫는 명령
+        sleep(1)
     end
+
+    def kill_selenium_chrome #기존 창 모두 닫는 코드
+        wmi = WIN32OLE.connect("winmgmts://")
+        chrome_procs = wmi.ExecQuery("SELECT * FROM Win32_Process WHERE Name = 'chrome.exe'")
+        
+        chrome_procs.each do |proc|
+        cmd = proc.CommandLine
+        if cmd && cmd.include?("user-data-dir=C:/tiktok_cookie")
+            puts "→ 크롬 창 초기화: PID #{proc.ProcessId}"
+            begin
+            proc.Terminate
+            rescue
+            #puts "→ 이미 종료된 프로세스: #{proc.ProcessId}"
+            end
+        end
+        end
+
+        # chromedriver도 같이 종료
+        chromedrivers = wmi.ExecQuery("SELECT * FROM Win32_Process WHERE Name = 'chromedriver.exe'")
+        chromedrivers.each do |proc|
+        puts "→ 크롬 창 초기화: PID #{proc.ProcessId}"
+        begin
+            proc.Terminate
+        rescue
+            #puts "→ 이미 종료된 chromedriver: #{proc.ProcessId}"
+        end
+        end
+    end 
     
 
     def chrome_setup(user_id, proxy)
@@ -948,21 +979,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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tiupd
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - zon
 bindir: bin
 cert_chain: []
-date: 2025-05-01 00:00:00.000000000 Z
+date: 2025-05-29 00:00:00.000000000 Z
 dependencies: []
 description: File to Clipboard gem
 email: mymin26@naver.com