posting_duo 3.111.002 → 3.111.005

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfe54959546d05086f1987d7597cdb601e30e0db4809c8f369e7c9c498c392a5
-  data.tar.gz: 0152f8ab79c439942b735c66e9dabd9a47770cb756350f61e445ea486b8e7d70
+  metadata.gz: a7059a2e61381d05735169ead0ee105eab4e3b457414fca4afbea96c2d76f1f6
+  data.tar.gz: 2640dcaa0dd2336a40877213eb3f3dd6b3953dc6f32d7770ed36abf31caedb7e
 SHA512:
-  metadata.gz: 5d8ba6dc8a02b70d7683cb4aaebc416aefb0ca246313591ff5adbf386fa0125fbc907f3cb6365488de18256360efb0fdfa993b5701e03e577e368083bb00b407
-  data.tar.gz: 3b5d2d6c333b5f520ce909af23b443631d0baa3c4ddf6b5e5efbd4a64001f6da6809018332e85119294a6c5b4271c2d19cce61a29fbc67a9fe0bcfe5775b73b8
+  metadata.gz: b41153ffd4e39f2d2f8d2f9928c8cf8eb0af6497c8b9186b4ceb36bc4a6fff3633521f1f131d9a072d29246e0be4a8ed4ceca90a5427089228d8046ed3751f81
+  data.tar.gz: c2c833d13f58e5379c33160e43c0064ea3b25c7d1d87538111ac823ad0455752544b80726474af6cb291d7f76dc39d53657f8aedcc6e11cf50b0cb8568516cb6

data/lib/posting_duo.rb

@@ -69,9 +69,8 @@ class Naver
                 options.add_argument('--disable-sync')  # Chrome 동기화 비활성화
                 options.add_argument('--disable-popup-blocking') # 팝업 방지 (로그인 창이 뜨는 경우 대비)
                 options.add_argument('--no-default-browser-check')
-                options.page_load_strategy = :normal
+                options.page_load_strategy = 'normal'
                 options.timeouts = {page_load: 30_000}
-                options.page_load_strategy = 'none'
                 options.add_argument('--disable-blink-features=AutomationControlled') #자동화된 환경에서 실행되는 것을 감지하는 기능을 비활성화합니다.
                 options.add_argument('--disable-gpu')
                 options.add_argument('--remote-debugging-port=9222')
@@ -120,9 +119,8 @@ class Naver
                 options.add_argument('--disable-popup-blocking') # 팝업 방지 (로그인 창이 뜨는 경우 대비)
                 options.add_argument('--no-default-browser-check')
                 options.add_argument '--proxy-server='+proxy.to_s.force_encoding('utf-8').to_s
-                options.page_load_strategy = :normal
+                options.page_load_strategy = 'normal'
                 options.timeouts = {page_load: 30_000}
-                options.page_load_strategy = 'none'
                 options.add_argument('--disable-blink-features=AutomationControlled') #자동화된 환경에서 실행되는 것을 감지하는 기능을 비활성화합니다.
                 options.add_argument('--disable-gpu')
                 options.add_argument('--remote-debugging-port=9222')
@@ -169,9 +167,8 @@ class Naver
                     options.add_argument('--disable-sync')  # Chrome 동기화 비활성화
                     options.add_argument('--disable-popup-blocking') # 팝업 방지 (로그인 창이 뜨는 경우 대비)
                     options.add_argument('--no-default-browser-check')
-                    options.page_load_strategy = :normal
+                    options.page_load_strategy = 'normal'
                     options.timeouts = {page_load: 30_000}
-                    options.page_load_strategy = 'none'
                     options.add_argument('--disable-blink-features=AutomationControlled') #자동화된 환경에서 실행되는 것을 감지하는 기능을 비활성화합니다.
                     options.add_argument('--disable-gpu')
                     options.add_argument('--remote-debugging-port=9222')
@@ -221,8 +218,15 @@ class Naver
             end
         end
     end
+
+    def wait_for_page_load(timeout: 30)
+        wait = Selenium::WebDriver::Wait.new(timeout: timeout)
+        wait.until { @driver.execute_script("return document.readyState") == "complete" }
+        rescue Selenium::WebDriver::Error::TimeoutError
+        puts "[!] 페이지 로딩이 30초 내 완료되지 않았습니다."
+    end
       
-      def login(proxy, captcha_key, board_cookie_dir = "C:/board_cookie")
+    def login(proxy, captcha_key, board_cookie_dir = "C:/board_cookie")
         @captcha_key = captcha_key
         @board_cookie_dir = "C:/board_cookie"
         current_dir = File.dirname(__FILE__)
@@ -252,7 +256,7 @@ class Naver
         
 
         chrome_start(proxy, board_cookie_dir)
-        
+        wait_for_page_load(timeout: 30)
   
         target_url = "https://chromewebstore.google.com/detail/captcha-solver-auto-recog/ifibfemgeogfhoebkmokieepdoobkbpo?hl=ko"
 
@@ -13083,83 +13087,110 @@ class Wordpress
 
    
 
+    def crop_image_height_under_width(path, min_crop_ratio = 0.625)
+    img = Magick::Image.read(path).first
+    width = img.columns
+    height = img.rows
+
+
+
+    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
+
+        cropped = img.crop(0, crop_top, width, new_height, true)
+        cropped.write(path)
+
+        
+    else
+    
+    end
+    end
+
     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'
-        }
+    # 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 = []
+    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
+    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
 
-            json = JSON.parse(res.body)
-            results = json['results']
-            mm = []
+        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
+        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 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
+        if mm.empty?
+        raise "No matching image"
+        end
 
-            selected_url = mm.sample
-            Down.download(selected_url, destination: "./image/memory.png")
-            puts "이미지 다운로드 완료: #{selected_url}"
+        selected_url = mm.sample
+        destination_path = "./image/memory.png"
+        Down.download(selected_url, destination: destination_path)
+        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
+        # 오직 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
@@ -13170,80 +13201,188 @@ class Wordpress
 
     def save_image
         if @data['이미지설정']['이미지'].length == 0
-
+            return
+        end
+    
+        if @data['이미지설정']['순서사용'].checked?
+            image_path = @data['이미지설정']['이미지'][@image_counter][2]
+            @image_counter += 1
+            if @image_counter > @data['이미지설정']['이미지'].length - 1
+                @image_counter = 0
+            end
         else
-            if @data['이미지설정']['순서사용'].checked?
-                image_path = @data['이미지설정']['이미지'][@image_counter][2]
-                @image_counter += 1
-                if @image_counter > @data['이미지설정']['이미지'].length-1
-                    @image_counter = 0
-                end
-            else
-                image_path = @data['이미지설정']['이미지'].sample[2]
+            # 초기화가 안됐거나 다 썼으면 새롭게 섞는다
+            @shuffled_images ||= []
+            if @shuffled_images.empty?
+                @shuffled_images = @data['이미지설정']['이미지'].shuffle
             end
-            img = Magick::Image.read(image_path).first
-            img.write('./image/memory.png')
+    
+            image_path = @shuffled_images.shift[2]
         end
+    
+        img = Magick::Image.read(image_path).first
+        img.write('./image/memory.png')
     end
 
     def change_image_size(w)
         img = Magick::Image.read('./image/memory.png').first
         width = img.columns
         height = img.rows
-        begin
-            if @data['image_type'][0].checked? or @data['image_type'][2].checked?
-                img.resize!(w, w*(height.to_f/width.to_f))
-            else
-                img.resize!(w, w)
+    
+        # '원본'이 선택된 경우, 리사이징을 하지 않고 원본 이미지를 그대로 반환
+        if w == 'original'
+            return img  # 원본 이미지 그대로 반환
+        else
+            begin
+                if @data['image_type'][0].checked? or @data['image_type'][2].checked?
+                    # 비율을 맞추어 리사이징
+                    img.resize!(w, w * (height.to_f / width.to_f))
+                else
+                    # 정사각형으로 리사이징
+                    img.resize!(w, w)
+                end
+            rescue
+                img.resize!(w, w)  # 예외 처리 시에도 리사이징
             end
-        rescue
-            img.resize!(w, w)
         end
+    
+        # 리사이징된 이미지 저장
         img.write('./image/memory.png')
     end
 
-    def image_text(text1, text2)
-        begin
-            color = File.open('./color.ini', 'r', :encoding => 'utf-8').read().split("\n")
-            font = Dir.entries('./fonts')
-            img = Magick::Image.read('./image/memory.png').first
-            text = Magick::Draw.new
-            color2 = color.sample
-            font2 = './fonts/'+font.sample
-            message = text1.to_s+"\n"+text2.to_s
-            begin
-                size = rand(@data['이미지설정']['이미지글자1크기1'].text.to_i..@data['이미지설정']['이미지글자1크기2'].text.to_i)
-            rescue
-                size = 30
-            end
-            if @data['이미지설정']['글자그림자'].checked?
-                img.annotate(text, 0,0, +3,+3, message) do
-                    text.gravity = Magick::CenterGravity
-                    text.pointsize = size
-                    text.fill = '#000000'
-                    text.font = font2
+    def wrap_text_to_fit(draw, text, max_width, max_height, font_path, initial_size)
+        size = initial_size
+        draw.font = font_path
+          
+        loop do
+            draw.pointsize = size
+            words = text.chars # 글자 단위로 자름 (한국어 기준)
+            lines = []
+            line = ""
+          
+            words.each do |char|
+                test_line = line + char
+                metrics = draw.get_type_metrics(test_line)
+                if metrics.width > max_width
+                  lines << line
+                  line = char
+                else
+                  line = test_line
                 end
             end
-
-            img.annotate(text, 0,0,0,0, message) do
-                text.gravity = Magick::CenterGravity
-                text.pointsize = size
-                if @data['이미지설정']['글자테두리'].checked?
-                    text.stroke_width = 2
-                    text.stroke = '#000000'
-                end
-                text.fill = color2
-                text.font = font2
+            lines << line unless line.empty?
+          
+            line_height = draw.get_type_metrics("가").height
+            total_height = line_height * lines.size
+          
+            # 세로 초과 안 하면 성공
+            if total_height <= max_height || size <= 10
+                return [lines.join("\n"), size]
+            else
+                size -= 2
             end
+        end
+    end
+          
+
+   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.write('./image/memory.png')
+        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
-            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")
         img = Magick::Image.read('./image/memory.png').first
@@ -13269,40 +13408,69 @@ class Wordpress
         else
             auto_image()
         end
-
-        image_size = [480,740,650,550,480]
+    
+        # '원본'을 포함한 이미지 크기 옵션 추가
+        image_size = [480, 740, 650, 550, 480, 'original']
         size = 0
-        for n in 0..4
+    
+        for n in 0..5  # 0부터 5까지 반복, '원본' 옵션까지 포함
             if @data['image_size'][n].checked?
-                if n == 0
-                    size = image_size.sample
+                if n == 5  # '원본'이 선택되었을 경우
+                    size = 'original'
+                elsif n == 0
+                    size = image_size.sample  # 랜덤 선택
                 else
                     size = image_size[n]
                 end
             end
         end
+    
+        # '원본'이 선택되지 않았다면 기본 값 설정
         if size == 0
             size = 480
         end
+    
+        change_image_size(size)  # 크기 변경 함수 호출
 
-        change_image_size(size)
 
         if @data['이미지설정']['필터사용'].checked?
             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?

metadata

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