sapos-print 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 384234557dbd5bbb4d34a176bff5b7380aa504fdfc386bb85152a707877ed9e2
-  data.tar.gz: 3032008fbab84616cc3cab20e99020f5fafdbadfec367903147fbb56067c042c
+  metadata.gz: 2203b37a5896bdfef0ef71bd913dfd1a461fd9c5ee4c7a87205d864043aa1a7b
+  data.tar.gz: 5b241d186803fa7d09814390fa8b941b2e943d22c6be18b2c057a1d6b739d298
 SHA512:
-  metadata.gz: 24faed91618fc8dbeea8e2cb72397ef811e6edf43553e2670da63ec822df6e97c99ddda2c038fede60cbb1a849a2ad11494a49771c5b674bd90cd2c238cfce60
-  data.tar.gz: 4bd1addf3406a81a578548ee0ac4f3c4a10be72a3235ce17bdb203829aa6e06f4b74dfa1e9afb22e90c86a8892fff1b5e6ce8b168c657f0341c67f38cd642cc8
+  metadata.gz: c8d56b32df32d081146bec0cf5195d2df5c19596c90e84677275f2c4c37d2b8950c359dc6474e4489dc8d89f0352a630f818fd5f608efbe196a492db2c59f184
+  data.tar.gz: 52b50bdcc53db8ea52df802e14ce6d86863d5ca073fa50da38860cc188495e6b8422c1ce07634e0a3387ccc69beb2d4ae2bad35e1ed8b194d1af6e527d7c83cc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    sapos-print (1.0.0)
+    sapos-print (1.0.1)
       activesupport
       awesome_print
       json

data/lib/sapos/print/cli.rb

@@ -32,6 +32,11 @@ module Sapos
         config = Sapos::Print.config
         puts ["Q=#{config.q.to_s}", "Printer=#{config.printer.to_s}", "Adapter=#{config.adapter.to_s}", "Interface=#{config.interface}"].join("\n")
         
+        print_dir = File.join(Sapos::Print.app_directory, 'print')
+        if File.exists?(print_dir)
+          FileUtils.rm_rf Dir.glob("#{print_dir}/*")
+        end
+        
         Sapos::Print::QReader.printer_config = config
         Sapos::Print::QReader.verbose = options[:verbose]
         Sapos::Print::QReader.run!
@@ -42,7 +47,33 @@ module Sapos
         info
         config = Sapos::Print.config
         printer = Printer.new(config)
-        printer.print("This is a test\nprint page\nwithno special commands")
+        printer.print(document: "This is a test\nprint page\nwithno special commands", document_number: "test", print_control: true)
+      end
+      
+      def windows_test_print
+        info
+        
+        filename = "test.print"
+        
+        dir = File.join(Dir.home,".sapos-print")
+        FileUtils.mkdir_p dir unless File.exists?(dir)
+        dir
+        
+        print_dir = File.join(dir, 'print')
+        
+        FileUtils.mkdir_p print_dir unless File.exists?(print_dir)
+        filename = File.join(print_dir, filename)
+        
+        puts "Test file Path: #{filename}"
+        File.open(filename, 'w'){|f| f.write("Test\nTest\nTest")}
+        puts "Execute COPY Command"
+        command = "COPY "+"'"+filename.gsub("/","\\")+"'"+'"\\\\%COMPUTERNAME%\\'+"TM"
+        
+        if !system(command)
+          puts "ERROR"
+        else
+          puts "OK"
+        end
       end
       
       no_tasks do

data/lib/sapos/print/printer.rb

@@ -2,26 +2,47 @@ module Sapos
   module Print
     class Printer
       
+      
       def initialize(config)
         @config = config
       end
       
-      def print(raw_message)        
-        puts "Print =>"
-        filename = SecureRandom.hex
+      def print(args = {})
+        raw_message = args[:document]
+      
+        log_text = "Print #{args[:document_number]},#{args[:print_control]}"
+        filename = "#{args[:document_number]}.print" if args[:document_number]
+        filename = SecureRandom.hex if filename.nil?
         result = false
         raw = raw_message.force_encoding("UTF-8")
         begin
-          printable = data(raw_message)
-          File.open(filename, 'w'){|f| f.write(printable)}
-          result  = send_to_printer({file: filename})
-          puts "Result: #{result}"
+          if args[:print_control] && args[:document_number]
+            print_dir = File.join(Sapos::Print.app_directory, 'print')
+            FileUtils.mkdir_p print_dir unless File.exists?(print_dir)
+            
+            filename = File.join(print_dir, filename)
+            if !File.exists?(filename)
+              printable = data(raw_message)
+              File.open(filename, 'w'){|f| f.write(printable)}
+              result  = send_to_printer({file: filename})
+              #puts "Result: #{result}"
+              log_text += " => OK"
+            end
+          else
+            printable = data(raw_message)
+            File.open(filename, 'w'){|f| f.write(printable)}
+            result  = send_to_printer({file: filename})
+            File.delete(filename) if File.exists?(filename)
+            #puts "Result: #{result}"
+            log_text += " => OK"
+          end
+          puts log_text
         rescue => e
           puts "#{e.message}"
           self.errors = e.message
           result = false
         ensure
-          File.delete(filename) if File.exists?(filename)
+          #File.delete(filename) if File.exists?(filename)
           return result
         end        
         
@@ -68,7 +89,10 @@ module Sapos
           return true
           
         when 'windows'
-          command = "copy #{opts[:file]} "+'"\\\\%COMPUTERNAME%\\'+@config.printer
+          #command = "copy" + ' "' + filename + '" ' + '"\\\\%COMPUTERNAME%\\'+"TM"
+          filename = opts[:file].to_s.gsub("/","\\")
+          command = "COPY " + '"' + filename + '" ' + '"\\\\%COMPUTERNAME%\\' + @config.printer
+          #command = "copy #{opts[:file]} "+'"\\\\%COMPUTERNAME%\\'+@config.printer
           if !system(command)
             puts "Not executed"
             return false

data/lib/sapos/print/q_reader.rb

@@ -14,7 +14,10 @@ module Sapos
         callback = Pubnub::SubscribeCallback.new(
           message: -> (envelope){
             document = Base64.decode64(envelope.result[:data][:message]['document'])
-            if reader.printer.print(document)
+            print_control = envelope.result[:data][:message]['print_control']
+            document_number = envelope.result[:data][:message]['document_number']
+            
+            if reader.printer.print(document: document, print_control: print_control, document_number: document_number)
               puts "OK"
             else
               puts "Printer Error".red

data/lib/sapos/print/version.rb

@@ -2,6 +2,6 @@
 
 module Sapos
   module Print
-    VERSION = "1.0.0"
+    VERSION = "1.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapos-print
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Josef Sauter
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: SAPOSCLOUD PRINT