wp_posting_duo 0.0.11 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06450a5281e0dd2b80e5cbce3d850b5f42286b525dec3f0929476be1356d3e35
-  data.tar.gz: 212bbd79860449e789f40b6b95fa54f5ee4c3ce99d9b877ba854491ed94c3431
+  metadata.gz: 484347fe6285924f3c72ca0d2bcc9ff657e10b74d53d91fa2504f87ed5e88ede
+  data.tar.gz: 5969bceea54588cde40d9fffad780d0bca877fc1719f90524b78d02b2e23f1dc
 SHA512:
-  metadata.gz: ca9f5c1b8fdeaf8f44457f92331bab29be2c10058deeea5cbc70c0a8b3ea3ab2c43554c5e9aee1e4a7a2fea67e72534f0d39b83617843148edf1aa1c975a5986
-  data.tar.gz: 56f7d211330c42f1cdd4bc2a3ea921e05abc2827815631572b0fc638e21e046c3879f6ad4da130e29c2fe8497d5eb2796d8e1ee06eeb966ae4c14f18192bf01a
+  metadata.gz: 36113eb3895963e4823858e058045cb26a1d0f948f1a4406d890b9aefbc44d585f51f73d9820a161235b583a166d83ed2c94a35999154fbc4373409205bb3db1
+  data.tar.gz: 123a95dac0facd827db318f076dc90cdfa5380122b787d1637b7833dfc6332a4d5a2c6074cf5c6a9c8d874639b215f6663c0d25193d6ba679d2732784e4256ee

data/lib/wp_posting_duo.rb

@@ -512,7 +512,6 @@ class Wordpress
     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 }
@@ -521,188 +520,80 @@ 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
-            # 초기화가 안됐거나 다 썼으면 새롭게 섞는다
-            @shuffled_images ||= []
-            if @shuffled_images.empty?
-                @shuffled_images = @data['이미지설정']['이미지'].shuffle
+            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]
             end
-    
-            image_path = @shuffled_images.shift[2]
+            img = Magick::Image.read(image_path).first
+            img.write('./image/memory.png')
         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
-    
-        # '원본'이 선택된 경우, 리사이징을 하지 않고 원본 이미지를 그대로 반환
-        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)  # 예외 처리 시에도 리사이징
+        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
-    
-        # 리사이징된 이미지 저장
         img.write('./image/memory.png')
     end
 
-    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
+    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
-            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
+            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
+                end
             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 = 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)
+            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
+            end
+            
+            img.write('./image/memory.png')
         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
+            puts '이미지 폰트 불러오기 오류 재시도...'
+            sleep(3)
+            retry
         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
@@ -728,86 +619,48 @@ class Wordpress
         else
             auto_image()
         end
-    
-        # '원본'을 포함한 이미지 크기 옵션 추가
-        image_size = [480, 740, 650, 550, 480, 'original']
+
+        image_size = [480,740,650,550,480]
         size = 0
-    
-        for n in 0..5  # 0부터 5까지 반복, '원본' 옵션까지 포함
+        for n in 0..4
             if @data['image_size'][n].checked?
-                if n == 5  # '원본'이 선택되었을 경우
-                    size = 'original'
-                elsif n == 0
-                    size = image_size.sample  # 랜덤 선택
+                if 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?
-            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
+            insert_image_text1 = @data['이미지설정']['이미지글자1'].sample
         end
 
         if @data['이미지설정']['글자삽입2'].checked?
-            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
+            insert_image_text2 = @data['이미지설정']['이미지글자2'].sample
         end
-            
+        
         if @data['이미지설정']['글자삽입1'].checked? or @data['이미지설정']['글자삽입2'].checked?
-            image_text(image_text_path1, image_text_path2)
+            image_text(insert_image_text1, insert_image_text2)
         end
 
         if @data['이미지설정']['테두리사용'].checked?
             border()
         end
 
-        sleep(1)
         time = Time.now.to_s.split(' ')[0..1].join('').split(':').join('').split('-').join('')
         FileUtils.cp('./image/memory.png', './image/'+@keyword+time+'.png')
-        hi_dir = Dir.pwd
-        iconv = Iconv.new('UTF-8', 'CP949')
-        begin
-            hi_dir = iconv.iconv(hi_dir)
-        rescue
-
-        end
-        return hi_dir+'/image/'+@keyword+time+'.png'
     end
 
     def image_update22
@@ -2506,27 +2359,17 @@ 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 == '..'
 
-                                            # 경로가 유효한지 확인
-                                            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
+                                                else
+                                                    @data['이미지설정']['이미지'] << [false, file, path+"\\"+file.force_encoding('utf-8')]
                                                 end
-
-                                                # 마지막 빈 항목 추가 후 제거 (원래 로직에 맞춰)
-                                                @data['이미지설정']['이미지'] << []
-                                                @data['이미지설정']['이미지'].pop
-                                            else
-                                                # 경로가 존재하지 않으면 경고 메시지 출력
-                                                puts "경로가 존재하지 않습니다: #{path}"
                                             end
+                                            @data['이미지설정']['이미지'] << []
+                                            @data['이미지설정']['이미지'].pop
                                         }
                                     }
                                 }
@@ -2674,7 +2517,6 @@ class Wordpress
                                                 @data['image_size'][2].checked = false
                                                 @data['image_size'][3].checked = false
                                                 @data['image_size'][4].checked = false
-                                                @data['image_size'][5].checked = false
                                             end
                                         }
                                     }
@@ -2685,7 +2527,6 @@ class Wordpress
                                                 @data['image_size'][2].checked = false
                                                 @data['image_size'][3].checked = false
                                                 @data['image_size'][4].checked = false
-                                                @data['image_size'][5].checked = false
                                             end
                                         }
                                     }
@@ -2696,7 +2537,6 @@ class Wordpress
                                                 @data['image_size'][0].checked = false
                                                 @data['image_size'][3].checked = false
                                                 @data['image_size'][4].checked = false
-                                                @data['image_size'][5].checked = false
                                             end
                                         }
                                     }
@@ -2707,7 +2547,6 @@ class Wordpress
                                                 @data['image_size'][2].checked = false
                                                 @data['image_size'][0].checked = false
                                                 @data['image_size'][4].checked = false
-                                                @data['image_size'][5].checked = false
                                             end
                                         }
                                     }
@@ -2718,18 +2557,6 @@ class Wordpress
                                                 @data['image_size'][2].checked = false
                                                 @data['image_size'][3].checked = false
                                                 @data['image_size'][0].checked = false
-                                                @data['image_size'][5].checked = false
-                                            end
-                                        }
-                                    }
-                                    @data['image_size'][5] = checkbox('원본 px'){
-                                        on_toggled{
-                                            if @data['image_size'][5].checked?
-                                                @data['image_size'][1].checked = false
-                                                @data['image_size'][2].checked = false
-                                                @data['image_size'][3].checked = false
-                                                @data['image_size'][0].checked = false
-                                                @data['image_size'][4].checked = false
                                             end
                                         }
                                     }

metadata

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