tblog_zon 0.0.52 → 0.0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59e32026de6913b1c3a5136ed8eb6c0a97b0ccd96f29e12a927ae9af4c6929cf
-  data.tar.gz: bb764327f7e69a61971315a1f612fda67b569926ea5dcf6917aa63634e787a58
+  metadata.gz: 674cd1bee02e91efd1d217ace77de8cc5143aadf9e97a7d1e6a3a37287100602
+  data.tar.gz: 5865b2572fb16ab3826fa78ff6b6e58017f558a855e2216dae05b5b00aa90b26
 SHA512:
-  metadata.gz: f63664a68e49b5a00bc0f388ac7678f8674efc953d098062778729beb9272d4fc6b1abb5d126e869f699e5784c8fa17b571c275bad55fcb1657fd862fad8c279
-  data.tar.gz: 91db21efda1c057656f5e39784cee829586e615ad0efe432ad9cc75797857215ec98bc6240243cdfd63a8738c0b17c20f207bc5d9fb01139a3b62ae49a68ce68
+  metadata.gz: 24c84d17c6f9a35a7e4d07427c79a702fa0177d496574902c2f5036c61ca6be639484fb10166afb730c0e3800c52a22e56e0ad0e37aac88aa2e5960f9a02bc8c
+  data.tar.gz: c7c75c38c0c962a3d4eac1da29b5d036465a623c1e9d7a60a73dcb66ac1ee99d082f9dad08e2f7de284b8fe438dd468fbbc29bf737f19dc43604fcd9be622824

data/lib/tblog_zon.rb

@@ -1686,84 +1686,116 @@ class Wordpress
 
    
 
-    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'
-        }
+    def crop_image_height_under_width(path, min_crop_ratio = 0.625)
+        img = Magick::Image.read(path).first
+        width = img.columns
+        height = img.rows
 
-        retry_count = 0
-        max_retries = 10
-        results = []
+        if height > width
+            min_height = (width * min_crop_ratio).to_i
+            new_height = rand(min_height..width)
+            crop_top = ((height - new_height) / 2.0).round
 
-        begin
-            page = rand(1..15)
-            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"
+            cropped = img.crop(0, crop_top, width, new_height, true)
+
+            retries = 0
+            begin
+                cropped.write(path)
+            rescue => e
+                retries += 1
+                puts "이미지 저장 오류 (#{e.message}), 재시도 #{retries}/5"
+                sleep(1)
+                retry if retries < 5
+                raise "이미지 저장 실패: #{e.message}"
             end
+        end
+    end
 
-            json = JSON.parse(res.body)
-            results = json['results']
-            mm = []
+    def auto_image(keyword = nil)
+    # auto_image 내부에서만 crop 호출
+    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)
+        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
 
-            results.each do |photo|
-            full_url = photo.dig('urls', 'full').to_s
-            regular_url = photo.dig('urls', 'regular').to_s
+        json = JSON.parse(res.body)
+        results = json['results']
+        mm = []
 
-            if full_url.start_with?("https://images.unsplash.com/photo-") &&
-                regular_url.include?("1080")
-                mm << full_url
-            end
-            end
+        results.each do |photo|
+        full_url = photo.dig('urls', 'full').to_s
+        regular_url = photo.dig('urls', 'regular').to_s
 
-            if mm.empty?
-            raise "No matching image"
-            end
+        if full_url.start_with?("https://images.unsplash.com/photo-") &&
+            regular_url.include?("1080")
+            mm << full_url
+        end
+        end
 
-            selected_url = mm.sample
-            Down.download(selected_url, destination: "./image/memory.png")
-            puts "이미지 다운로드 완료: #{selected_url}"
+        if mm.empty?
+        raise "No matching image"
+        end
 
-        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
+        selected_url = mm.sample
+        destination_path = "./image/memory.png"
+        Down.download(selected_url, destination: destination_path)
+        puts "이미지 다운로드 완료: #{selected_url}"
+
+        # 오직 auto_image에서만 자르기 호출
+        crop_image_height_under_width(destination_path)
+
+    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}"
+            crop_image_height_under_width("./image/memory.png")
             else
-                puts "이미지 결과가 없어 다운로드할 수 없습니다. 단색 배경 이미지 생성합니다."
-                color_image
-            end
+            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 }
@@ -1856,56 +1888,103 @@ class Wordpress
     end
           
 
-    def image_text(text1, text2)
+   def image_text(text1, text2)
+    begin
+        color = File.open('./color.ini', 'r', encoding: 'utf-8').read.split("\n").map(&:strip).reject(&:empty?)
+        font_files = Dir.entries('./fonts').select { |f| f.downcase.end_with?('.ttf') }
+        font2 = './fonts/' + font_files.sample
+
+        # 랜덤 글자색 선택
+        color2 = color.sample
+
+        # 헬퍼 함수: 색상 문자열 '#RRGGBB' -> [R,G,B] 배열로 변환
+        def hex_to_rgb(hex)
+        hex = hex.delete('#')
+        [hex[0..1], hex[2..3], hex[4..5]].map { |c| c.to_i(16) }
+        end
+
+        # 헬퍼 함수: 두 RGB 색상의 차이 계산 (간단한 유클리드 거리)
+        def color_distance(c1, c2)
+        Math.sqrt(
+            (c1[0] - c2[0])**2 +
+            (c1[1] - c2[1])**2 +
+            (c1[2] - c2[2])**2
+        )
+        end
+
+        # 대비가 충분히 되는 테두리 색상 선택
+        max_attempts = 10
+        stroke_color = nil
+        base_rgb = hex_to_rgb(color2)
+
+        max_attempts.times do
+        candidate = color.sample
+        candidate_rgb = hex_to_rgb(candidate)
+        dist = color_distance(base_rgb, candidate_rgb)
+
+        # 거리(차이) 임계값 100 (0~441 범위) — 필요시 조절 가능
+        if dist > 100
+            stroke_color = candidate
+            break
+        end
+        end
+        stroke_color ||= '#000000'  # 만약 충분히 다른 색 없으면 검정색 기본값
+
+        img = Magick::Image.read('./image/memory.png').first
+        draw = Magick::Draw.new
+
+        raw_message = "#{text1}\n#{text2}".strip
+        max_width = img.columns * 0.85
+        max_height = img.rows * 0.6
+
         begin
-            color = File.open('./color.ini', 'r', :encoding => 'utf-8').read().split("\n")
-            font_files = Dir.entries('./fonts').select { |f| f.downcase.end_with?('.ttf') }
-            font2 = './fonts/' + font_files.sample
-            color2 = color.sample
-          
-            img = Magick::Image.read('./image/memory.png').first
-            draw = Magick::Draw.new
-          
-            raw_message = "#{text1}\n#{text2}".strip
-            max_width = img.columns * 0.85
-            max_height = img.rows * 0.6
-          
-            begin
-                size = rand(@data['이미지설정']['이미지글자1크기1'].text.to_i..@data['이미지설정']['이미지글자1크기2'].text.to_i)
-            rescue
-                size = 30
-            end
-          
-            wrapped_message, adjusted_size = wrap_text_to_fit(draw, raw_message, max_width, max_height, font2, size)
-          
-            if @data['이미지설정']['글자그림자'].checked?
-                img.annotate(draw, 0, 0, 2, 2, wrapped_message) do
-                  draw.gravity = Magick::CenterGravity
-                  draw.pointsize = adjusted_size
-                  draw.fill = '#000000'
-                  draw.font = font2
-                end
-            end
-          
-            draw2 = Magick::Draw.new
-            img.annotate(draw2, 0, 0, 0, 0, wrapped_message) do
-                draw2.gravity = Magick::CenterGravity
-                draw2.pointsize = adjusted_size
-                draw2.fill = color2
-                draw2.font = font2
-                if @data['이미지설정']['글자테두리'].checked?
-                    draw2.stroke_width = 2
-                    draw2.stroke = '#000000'
-                end
-            end
-          
-            img.write('./image/memory.png')
+        size = rand(@data['이미지설정']['이미지글자1크기1'].text.to_i..@data['이미지설정']['이미지글자1크기2'].text.to_i)
         rescue
-            puts '이미지 폰트 불러오기 오류 재시도...'
-            sleep(3)
-            retry
+        size = 30
+        end
+
+        wrapped_message, adjusted_size = wrap_text_to_fit(draw, raw_message, max_width, max_height, font2, size)
+
+        if @data['이미지설정']['글자그림자'].checked?
+        img.annotate(draw, 0, 0, 2, 2, wrapped_message) do
+            draw.gravity = Magick::CenterGravity
+            draw.pointsize = adjusted_size
+            draw.fill = '#000000'
+            draw.font = font2
+        end
+        end
+
+        if @data['이미지설정']['글자테두리'].checked?
+        draw_stroke = Magick::Draw.new
+        img.annotate(draw_stroke, 0, 0, 0, 0, wrapped_message) do
+            draw_stroke.gravity = Magick::CenterGravity
+            draw_stroke.pointsize = adjusted_size
+            draw_stroke.fill = 'none'
+            draw_stroke.stroke = stroke_color
+            draw_stroke.stroke_width = rand(5..10)
+            draw_stroke.font = font2
+        end
+        end
+
+        draw2 = Magick::Draw.new
+        img.annotate(draw2, 0, 0, 0, 0, wrapped_message) do
+        draw2.gravity = Magick::CenterGravity
+        draw2.pointsize = adjusted_size
+        draw2.fill = color2
+        draw2.stroke = 'none'
+        draw2.font = font2
         end
+
+        img.write('./image/memory.png')
+
+    rescue => e
+        puts "이미지 폰트 불러오기 오류 재시도... (#{e.message})"
+        sleep(3)
+        retry
     end
+    end
+
+
 
     def border()
         color = File.open('./color.ini', 'r',:encoding => 'utf-8').read().split("\n")
@@ -1932,7 +2011,7 @@ class Wordpress
         else
             auto_image()
         end
-
+    
         # '원본'을 포함한 이미지 크기 옵션 추가
         image_size = [480, 740, 650, 550, 480, 'original']
         size = 0
@@ -1956,6 +2035,7 @@ class Wordpress
     
         change_image_size(size)  # 크기 변경 함수 호출
 
+
         if @data['이미지설정']['필터사용'].checked?
             image_filter()
         end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: tblog_zon
 version: !ruby/object:Gem::Version
-  version: 0.0.52
+  version: 0.0.55
 platform: ruby
 authors:
 - zon
 bindir: bin
 cert_chain: []
-date: 2025-05-30 00:00:00.000000000 Z
+date: 2025-06-26 00:00:00.000000000 Z
 dependencies: []
 description: File to Clipboard gem
 email: mymin26@naver.com