cafe_basics_duo 0.1.37 → 0.1.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ea656b168468dcf680e00ba06a615aca79d3e3748eb33cfa1bee9f90923c29d
-  data.tar.gz: 6f892b0c8c816bb68af4ffd3aac73f04327c8934d90af79cd77cda7e67718b44
+  metadata.gz: db47545057da1ed220f0acef61de25124c3b3fa6f01e2dd2004130248a1be38e
+  data.tar.gz: 3e6192f22d66a9d84c94d59abdb2cde7efb7671441335d546bf9455a35fc13fe
 SHA512:
-  metadata.gz: b30ffce6f681d19d52e248866ac695f991f7e39d130dfb329c9d88cc731f23b879a9d99929a8c53675abce0f14f1f9000efacd6a35cb046973dad4030055ae7b
-  data.tar.gz: 27490fd24522ec64ffb0a47c8cbab371c172ed272764e5ac959e1b743c49574b72ddcc5418e29e3789cc6623d9be6d36d4232637a2e6aa85104fa6cce7f6d879
+  metadata.gz: aede245bce13a80690fcaf709020396142a19c78ec0d60abf71c26aa9c6198db062889f8cbd430e353108d35bc6e63d40fe41b3cc8e4f20b5d0eab9b35d958f9
+  data.tar.gz: 8f766bde4e2b8d53a9450e5482c9ccffd20827d29adb4e76e3bee9df7a425f4780b82acdcfabc44e52bc99a85c420bc8439336f8b4a154ea3dc4d8d4e9ff88a5

data/lib/cafe_basics_duo.rb

@@ -18,6 +18,7 @@ require 'digest'
 require 'auto_click'
 require 'rainbow/refinement'
 require 'httpclient'
+#require 'win32ole'
 include AutoClickMethods
 using Rainbow
 include Glimmer
@@ -242,8 +243,38 @@ end
 class Naver
     def initialize
         @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:/naver_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)
         naver_cookie_dir = "C:/naver_cookie"
@@ -2145,52 +2176,106 @@ class Wordpress
         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 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
+            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")
-            font = Dir.entries('./fonts')
-            img = Magick::Image.read('./image/memory.png').first
-            text = Magick::Draw.new
+            font_files = Dir.entries('./fonts').select { |f| f.downcase.end_with?('.ttf') }
+            font2 = './fonts/' + font_files.sample
             color2 = color.sample
-            font2 = './fonts/'+font.sample
-            message = text1.to_s+"\n"+text2.to_s
+          
+            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(text, 0,0, +3,+3, message) do
-                    text.gravity = Magick::CenterGravity
-                    text.pointsize = size
-                    text.fill = '#000000'
-                    text.font = font2
+                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
-
-            img.annotate(text, 0,0,0,0, message) do
-                text.gravity = Magick::CenterGravity
-                text.pointsize = size
+          
+            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?
-                    text.stroke_width = 2
-                    text.stroke = '#000000'
+                    draw2.stroke_width = 2
+                    draw2.stroke = '#000000'
                 end
-                text.fill = color2
-                text.font = font2
             end
-
+          
             img.write('./image/memory.png')
         rescue
             puts '이미지 폰트 불러오기 오류 재시도...'
@@ -2224,23 +2309,30 @@ 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()
@@ -2248,33 +2340,33 @@ class Wordpress
 
         if @data['이미지설정']['글자삽입1'].checked?
             if @data['이미지설정']['이미지글자1'].length == 0
-            image_text_path1 = ''
+                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
+                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?
             if @data['이미지설정']['이미지글자2'].length == 0
-            image_text_path2 = ''
-            else
-            if @data['이미지설정']['글자랜덤'].checked?
-            image_text_path2 = @data['이미지설정']['이미지글자2'].sample
+                image_text_path2 = ''
             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
+                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
             
@@ -4644,6 +4736,7 @@ 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
                                         }
                                     }
@@ -4654,6 +4747,7 @@ 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
                                         }
                                     }
@@ -4664,6 +4758,7 @@ 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
                                         }
                                     }
@@ -4674,6 +4769,7 @@ 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
                                         }
                                     }
@@ -4684,6 +4780,18 @@ 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: cafe_basics_duo
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.50
 platform: ruby
 authors:
 - zon
 bindir: bin
 cert_chain: []
-date: 2025-05-23 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies: []
 description: File to Clipboard gem
 email: mymin26@naver.com