thecore_print_commons 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d1b92c4037ed26563a1e1d0e5f25f227031ff4c0a8e53dc10f17eedb99b10f5
-  data.tar.gz: deacf2f9bbcd581b3b333aac24ed4e70dd257f86f5dad91adad804be6a9e245b
+  metadata.gz: b3d14d2d7122107560e3483a45aaab2f69efb513fae2f2c4368f996e79b61067
+  data.tar.gz: 69c327df788227be6659c6a6dd7ddcfda0af077bc18b82fb177b20ae3046a8f2
 SHA512:
-  metadata.gz: b0b8a1316816c8f56fc18b7e16044c97ae191c98f5f269c5839bf273e7ac6e031caf04e18b212184269f7511ff907759903d4b28f595b0bc10d86fe812e84497
-  data.tar.gz: 07e92ae60c6d391b40220e21e349bf14635b45e1fb2344c8008ac0c1dae72a5ddc4abd8407c5f2107ab3bf0d15b2c45389d5d24db2eea3382686f66c4e1ca4c5
+  metadata.gz: 9841914519bfb9b77f1dd53c2f4ffcc344e411f083830a5104101be69b5ee4821636203d0c9a77cd09a7d39209b43a43098b4965236fa1f823ee6a365501c6f1
+  data.tar.gz: 826d5bd6e22ef43312e244b63ce864b6223b836f0f3ae4612516d555943b6760385b6839735f8445f96f90694bd5390c5980dbf8a42b0be87847b787aa7fc809

data/app/models/concerns/api/printer.rb

@@ -41,5 +41,37 @@ module Api::Printer
             ::PrintWorker.perform_async(printer.ip, printer.port, text)
             { info: "Print job sent in background to #{printer.ip} on port #{printer.port}" }
         end
+
+        def self.custom_action_printer_status params
+            printer = Printer.find(params[:id])
+            ip = printer.ip
+            port = printer.port
+            begin
+                s = Socket.tcp ip, port, connect_timeout: 0.5
+                # Must create intepolation between item and template
+                # Printer.template può essere anche
+                # una parola di comando epr chiedere lo stato della stampante, solo nel caso sia ok,
+                # Allora mando la stampa
+                s.puts("~hs")
+                # Attende per la risposta (si mette in wait)
+                response = []
+                while (response_text = s.gets)
+                    response << response_text
+                    break if response.count == 3
+                end
+                s.close
+                # Rails.logger.info "PrintIt: RESPONSE: #{response.inspect}"
+                first = response[0].split(",")
+                second = response[1].split(",")
+                return "HEAD UP" if second[2].to_i == 1
+                return "RIBBON OUT" if second[3].to_i == 1
+                return "PAPER OUT" if first[1].to_i == 1
+                return "PAUSE" if first[2].to_i == 1
+                return "OK"
+            rescue
+                Rails.logger.info "PrintIt: STATUS: UNREACHABLE"
+                return "UNREACHABLE"
+            end
+        end
     end
 end

data/app/models/printer.rb

@@ -55,18 +55,11 @@ class Printer < ApplicationRecord
   
   def online?
     begin
-      Socket.tcp(self.ip, 9100, connect_timeout: 0.5).close
+      Socket.tcp(self.ip, self.port, connect_timeout: 0.5).close
     rescue
       return false
     end
     true
   end
-  
-  
-  # private
-  # def check_if_unique_default
-  #   if self.default?
-  #     Printer.where.not(id: self.id)
-  #   end
-  # end
+
 end

data/app/workers/print_worker.rb

@@ -7,73 +7,13 @@ class PrintWorker
     # ZPL print
     def perform ip, port, text
         @pjob = PrintJob.create(printer_id: Printer.find_by(ip: ip), finished: false, iserror: false, total: 0, printed: 0)
-        status = check_status(ip)
-        print_job_status = false
-        if status == "OK"
-            begin
-                streamSock = TCPSocket.new ip, port
-                streamSock.send text, 0
-                streamSock.close
-                print_job_status = true
-            rescue
-                @pjob.update(iserror: true, description: "PRINTER ERROR: TIMEOUT")
-                print_job_status = false
-            end
-        else
-            @pjob.update(iserror: true, description: "PRINTER ERROR: #{status}")
-            print_job_status = false
-        end
+        streamSock = Socket.tcp ip, port, connect_timeout: 0.5
+        streamSock.send text, 0
+        streamSock.close
         # '~hs alla posizione 56 per 8 caratteri la quantità di etichette rimaste'
         total = text.scan(/~PQ(\d+)/).last.first.to_i rescue 0
-        @pjob.update(printed: (print_job_status ? total : 0)) # Se risultato true, allora ha stampato tutto, altrimenti non ha stampato nulla
+        @pjob.update(printed: total) # Se risultato true, allora ha stampato tutto, altrimenti non ha stampato nulla
         @pjob.update(total: total) # In realtà è inutile, ora manda tutto quello che può alla stampante, solo lei può andare storta
-        @pjob.update(finished: print_job_status)
+        @pjob.update(finished: true)
     end
-    
-    def check_status printer
-        begin
-            s = TCPSocket.new(printer, 9100)
-            # Must create intepolation between item and template
-            # Printer.template può essere anche
-            # una parola di comando epr chiedere lo stato della stampante, solo nel caso sia ok,
-            # Allora mando la stampa
-            s.puts("~hs")
-            # Attende per la risposta (si mette in wait)
-            response = []
-            while (response_text = s.gets)
-                response << response_text
-                break if response.count == 3
-            end
-            s.close
-            Rails.logger.info "PrintIt: RESPONSE: #{response.inspect}"
-            first = response[0].split(",")
-            second = response[1].split(",")
-            return "HEAD UP" if second[2].to_i == 1
-            return "RIBBON OUT" if second[3].to_i == 1
-            return "PAPER OUT" if first[1].to_i == 1
-            return "PAUSE" if first[2].to_i == 1
-            return "OK"
-        rescue
-            Rails.logger.info "PrintIt: STATUS: UNREACHABLE"
-            return "UNREACHABLE"
-        end
-    end
-    
-    # This is for cups only
-    # def perform printer_cups_name, text
-    #     # if Settings.ns(:printer_commons).cups_server.blank? || ['127.0.0.1', 'localhost'].contains(Settings.ns(:printer_commons).cups_server)
-    #     #     printer = CupsPrinter.new printer_cups_name
-    #     #     printer.print_data text, 'text/plain'
-    #     #     printer.close
-    #     # else
-    #     print_file = "/tmp/print-#{printer_cups_name}-#{Time.now.strftime '%Y%m%d%H%M%S%L'}"
-    #     puts "Creating temp file: #{print_file}"
-    #     IO.write(print_file, text)
-    #     # CupsPrinter.new printer_cups_name, hostname: Settings.ns(:printer_commons).cups_server
-    #     # printer.print_data text, 'text/plain', hostname: Settings.ns(:printer_commons).cups_server
-    #     puts "Printing with lp command on #{printer_cups_name} of #{Settings.ns(:printer_commons).cups_server} "
-    #     `cupsenable "#{printer_cups_name}";lp -d "#{printer_cups_name}" -h "#{Settings.ns(:printer_commons).cups_server}" -o raw "#{print_file}"`
-    #     File.delete print_file
-    #     # end
-    # end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: thecore_print_commons
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Gabriele Tassoni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2021-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thecore_background_jobs