mirror of
https://github.com/OCA/report-print-send.git
synced 2025-02-16 07:11:31 +02:00
[FIX] .travis.yml: Update definition
This commit is contained in:
Pedro M. Baeza
committed by
Carlos Roca
Carlos Roca
parent
b1103c7b6d
commit
226d4b2c31
@@ -3,7 +3,8 @@
|
||||
|
||||
import logging
|
||||
from datetime import datetime
|
||||
from odoo import models, fields, exceptions, _
|
||||
|
||||
from odoo import _, exceptions, fields, models
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
@@ -11,26 +12,25 @@ _logger = logging.getLogger(__name__)
|
||||
try:
|
||||
import cups
|
||||
except ImportError:
|
||||
_logger.debug('Cannot `import cups`.')
|
||||
_logger.debug("Cannot `import cups`.")
|
||||
|
||||
|
||||
class PrintingServer(models.Model):
|
||||
_name = 'printing.server'
|
||||
_description = 'Printing server'
|
||||
_name = "printing.server"
|
||||
_description = "Printing server"
|
||||
|
||||
name = fields.Char(
|
||||
default='Localhost', required=True, help='Name of the server.')
|
||||
name = fields.Char(default="Localhost", required=True, help="Name of the server.")
|
||||
address = fields.Char(
|
||||
default='localhost', required=True,
|
||||
help='IP address or hostname of the server')
|
||||
port = fields.Integer(
|
||||
default=631, required=True, help='Port of the server.')
|
||||
active = fields.Boolean(
|
||||
default=True, help='If checked, this server is useable.')
|
||||
default="localhost", required=True, help="IP address or hostname of the server"
|
||||
)
|
||||
port = fields.Integer(default=631, required=True, help="Port of the server.")
|
||||
active = fields.Boolean(default=True, help="If checked, this server is useable.")
|
||||
printer_ids = fields.One2many(
|
||||
comodel_name='printing.printer', inverse_name='server_id',
|
||||
string='Printers List',
|
||||
help='List of printers available on this server.')
|
||||
comodel_name="printing.printer",
|
||||
inverse_name="server_id",
|
||||
string="Printers List",
|
||||
help="List of printers available on this server.",
|
||||
)
|
||||
|
||||
def _open_connection(self, raise_on_error=False):
|
||||
self.ensure_one()
|
||||
@@ -38,10 +38,11 @@ class PrintingServer(models.Model):
|
||||
try:
|
||||
connection = cups.Connection(host=self.address, port=self.port)
|
||||
except Exception:
|
||||
message = _("Failed to connect to the CUPS server on %s:%s. "
|
||||
"Check that the CUPS server is running and that "
|
||||
"you can reach it from the Odoo server.") % (
|
||||
self.address, self.port)
|
||||
message = _(
|
||||
"Failed to connect to the CUPS server on %s:%s. "
|
||||
"Check that the CUPS server is running and that "
|
||||
"you can reach it from the Odoo server."
|
||||
) % (self.address, self.port)
|
||||
_logger.warning(message)
|
||||
if raise_on_error:
|
||||
raise exceptions.UserError(message)
|
||||
@@ -63,28 +64,25 @@ class PrintingServer(models.Model):
|
||||
for server in servers:
|
||||
connection = server._open_connection(raise_on_error=raise_on_error)
|
||||
if not connection:
|
||||
server.printer_ids.write({'status': 'server-error'})
|
||||
server.printer_ids.write({"status": "server-error"})
|
||||
res = False
|
||||
continue
|
||||
|
||||
# Update Printers
|
||||
printers = connection.getPrinters()
|
||||
existing_printers = dict([
|
||||
(printer.system_name, printer)
|
||||
for printer in server.printer_ids
|
||||
])
|
||||
existing_printers = {
|
||||
printer.system_name: printer for printer in server.printer_ids
|
||||
}
|
||||
updated_printers = []
|
||||
for name, printer_info in printers.items():
|
||||
printer = self.env['printing.printer']
|
||||
printer = self.env["printing.printer"]
|
||||
if name in existing_printers:
|
||||
printer = existing_printers[name]
|
||||
|
||||
printer_values = printer._prepare_update_from_cups(
|
||||
connection, printer_info)
|
||||
printer_values.update(
|
||||
system_name=name,
|
||||
server_id=server.id,
|
||||
connection, printer_info
|
||||
)
|
||||
printer_values.update(system_name=name, server_id=server.id)
|
||||
updated_printers.append(name)
|
||||
if not printer:
|
||||
printer.create(printer_values)
|
||||
@@ -93,8 +91,8 @@ class PrintingServer(models.Model):
|
||||
|
||||
# Set printers not found as unavailable
|
||||
server.printer_ids.filtered(
|
||||
lambda record: record.system_name not in updated_printers)\
|
||||
.write({'status': 'unavailable'})
|
||||
lambda record: record.system_name not in updated_printers
|
||||
).write({"status": "unavailable"})
|
||||
|
||||
return res
|
||||
|
||||
@@ -103,18 +101,18 @@ class PrintingServer(models.Model):
|
||||
self = self.search([])
|
||||
return self.update_jobs()
|
||||
|
||||
def update_jobs(self, which='all', first_job_id=-1):
|
||||
job_obj = self.env['printing.job']
|
||||
printer_obj = self.env['printing.printer']
|
||||
def update_jobs(self, which="all", first_job_id=-1):
|
||||
job_obj = self.env["printing.job"]
|
||||
printer_obj = self.env["printing.printer"]
|
||||
|
||||
mapping = {
|
||||
3: 'pending',
|
||||
4: 'pending held',
|
||||
5: 'processing',
|
||||
6: 'processing stopped',
|
||||
7: 'canceled',
|
||||
8: 'aborted',
|
||||
9: 'completed',
|
||||
3: "pending",
|
||||
4: "pending held",
|
||||
5: "processing",
|
||||
6: "processing stopped",
|
||||
7: "canceled",
|
||||
8: "aborted",
|
||||
9: "completed",
|
||||
}
|
||||
|
||||
# Update printers list, to ensure that jobs printers will be in Odoo
|
||||
@@ -127,86 +125,91 @@ class PrintingServer(models.Model):
|
||||
|
||||
# Retrieve asked job data
|
||||
jobs_data = connection.getJobs(
|
||||
which_jobs=which, first_job_id=first_job_id,
|
||||
which_jobs=which,
|
||||
first_job_id=first_job_id,
|
||||
requested_attributes=[
|
||||
'job-name',
|
||||
'job-id',
|
||||
'printer-uri',
|
||||
'job-media-progress',
|
||||
'time-at-creation',
|
||||
'job-state',
|
||||
'job-state-reasons',
|
||||
'time-at-processing',
|
||||
'time-at-completed',
|
||||
])
|
||||
"job-name",
|
||||
"job-id",
|
||||
"printer-uri",
|
||||
"job-media-progress",
|
||||
"time-at-creation",
|
||||
"job-state",
|
||||
"job-state-reasons",
|
||||
"time-at-processing",
|
||||
"time-at-completed",
|
||||
],
|
||||
)
|
||||
|
||||
# Retrieve known uncompleted jobs data to update them
|
||||
if which == 'not-completed':
|
||||
oldest_uncompleted_job = job_obj.search([
|
||||
('job_state', 'not in', (
|
||||
'canceled',
|
||||
'aborted',
|
||||
'completed',
|
||||
)),
|
||||
], limit=1, order='job_id_cups')
|
||||
if which == "not-completed":
|
||||
oldest_uncompleted_job = job_obj.search(
|
||||
[("job_state", "not in", ("canceled", "aborted", "completed"))],
|
||||
limit=1,
|
||||
order="job_id_cups",
|
||||
)
|
||||
if oldest_uncompleted_job:
|
||||
jobs_data.update(connection.getJobs(
|
||||
which_jobs='completed',
|
||||
first_job_id=oldest_uncompleted_job.job_id_cups,
|
||||
requested_attributes=[
|
||||
'job-name',
|
||||
'job-id',
|
||||
'printer-uri',
|
||||
'job-media-progress',
|
||||
'time-at-creation',
|
||||
'job-state',
|
||||
'job-state-reasons',
|
||||
'time-at-processing',
|
||||
'time-at-completed',
|
||||
]))
|
||||
jobs_data.update(
|
||||
connection.getJobs(
|
||||
which_jobs="completed",
|
||||
first_job_id=oldest_uncompleted_job.job_id_cups,
|
||||
requested_attributes=[
|
||||
"job-name",
|
||||
"job-id",
|
||||
"printer-uri",
|
||||
"job-media-progress",
|
||||
"time-at-creation",
|
||||
"job-state",
|
||||
"job-state-reasons",
|
||||
"time-at-processing",
|
||||
"time-at-completed",
|
||||
],
|
||||
)
|
||||
)
|
||||
|
||||
all_cups_job_ids = set()
|
||||
for cups_job_id, job_data in jobs_data.items():
|
||||
all_cups_job_ids.add(cups_job_id)
|
||||
jobs = job_obj.with_context(active_test=False).search([
|
||||
('job_id_cups', '=', cups_job_id),
|
||||
('server_id', '=', server.id),
|
||||
])
|
||||
jobs = job_obj.with_context(active_test=False).search(
|
||||
[("job_id_cups", "=", cups_job_id), ("server_id", "=", server.id)]
|
||||
)
|
||||
job_values = {
|
||||
'name': job_data.get('job-name', ''),
|
||||
'active': True,
|
||||
'job_id_cups': cups_job_id,
|
||||
'job_media_progress': job_data.get(
|
||||
'job-media-progress', False),
|
||||
'job_state': mapping.get(
|
||||
job_data.get('job-state'), 'unknown'),
|
||||
'job_state_reason': job_data.get('job-state-reasons', ''),
|
||||
'time_at_creation': fields.Datetime.to_string(
|
||||
datetime.fromtimestamp(job_data.get(
|
||||
'time-at-creation', False))),
|
||||
'time_at_processing': job_data.get(
|
||||
'time-at-processing', False) and
|
||||
fields.Datetime.to_string(datetime.fromtimestamp(
|
||||
job_data.get('time-at-processing', False))),
|
||||
'time_at_completed': job_data.get(
|
||||
'time-at-completed', False) and
|
||||
fields.Datetime.to_string(datetime.fromtimestamp(
|
||||
job_data.get('time-at-completed', False))),
|
||||
"name": job_data.get("job-name", ""),
|
||||
"active": True,
|
||||
"job_id_cups": cups_job_id,
|
||||
"job_media_progress": job_data.get("job-media-progress", False),
|
||||
"job_state": mapping.get(job_data.get("job-state"), "unknown"),
|
||||
"job_state_reason": job_data.get("job-state-reasons", ""),
|
||||
"time_at_creation": fields.Datetime.to_string(
|
||||
datetime.fromtimestamp(job_data.get("time-at-creation", False))
|
||||
),
|
||||
"time_at_processing": job_data.get("time-at-processing", False)
|
||||
and fields.Datetime.to_string(
|
||||
datetime.fromtimestamp(
|
||||
job_data.get("time-at-processing", False)
|
||||
)
|
||||
),
|
||||
"time_at_completed": job_data.get("time-at-completed", False)
|
||||
and fields.Datetime.to_string(
|
||||
datetime.fromtimestamp(job_data.get("time-at-completed", False))
|
||||
),
|
||||
}
|
||||
|
||||
# Search for the printer in Odoo
|
||||
printer_uri = job_data['printer-uri']
|
||||
printer_system_name = printer_uri[printer_uri.rfind('/') + 1:]
|
||||
printer = printer_obj.search([
|
||||
('server_id', '=', server.id),
|
||||
('system_name', '=', printer_system_name),
|
||||
], limit=1)
|
||||
printer_uri = job_data["printer-uri"]
|
||||
printer_system_name = printer_uri[printer_uri.rfind("/") + 1 :]
|
||||
printer = printer_obj.search(
|
||||
[
|
||||
("server_id", "=", server.id),
|
||||
("system_name", "=", printer_system_name),
|
||||
],
|
||||
limit=1,
|
||||
)
|
||||
# CUPS retains jobs for disconnected printers and also may
|
||||
# leak jobs data for unshared printers, therefore we just
|
||||
# discard here if not printer found
|
||||
if not printer:
|
||||
continue
|
||||
job_values['printer_id'] = printer.id
|
||||
job_values["printer_id"] = printer.id
|
||||
|
||||
if jobs:
|
||||
jobs.write(job_values)
|
||||
@@ -214,10 +217,10 @@ class PrintingServer(models.Model):
|
||||
job_obj.create(job_values)
|
||||
|
||||
# Deactive purged jobs
|
||||
if which == 'all' and first_job_id == -1:
|
||||
purged_jobs = job_obj.search([
|
||||
('job_id_cups', 'not in', list(all_cups_job_ids)),
|
||||
])
|
||||
purged_jobs.write({'active': False})
|
||||
if which == "all" and first_job_id == -1:
|
||||
purged_jobs = job_obj.search(
|
||||
[("job_id_cups", "not in", list(all_cups_job_ids))]
|
||||
)
|
||||
purged_jobs.write({"active": False})
|
||||
|
||||
return True
|
||||
|
||||
Reference in New Issue
Block a user