-
-
Notifications
You must be signed in to change notification settings - Fork 173
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#1761 move file-transfers and printing to a mixin
git-svn-id: https://xpra.org/svn/Xpra/trunk@18563 3bb7dfac-3a0b-4e04-842a-767bc560f471
- Loading branch information
Showing
2 changed files
with
153 additions
and
122 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| # -*- coding: utf-8 -*- | ||
| # This file is part of Xpra. | ||
| # Copyright (C) 2010-2018 Antoine Martin <[email protected]> | ||
| # Xpra is released under the terms of the GNU GPL v2, or, at your option, any | ||
| # later version. See the file COPYING for details. | ||
|
|
||
| import os | ||
|
|
||
| from xpra.log import Logger | ||
| log = Logger("printing") | ||
|
|
||
| from xpra.util import envbool | ||
| from xpra.os_util import get_machine_id | ||
| from xpra.net.file_transfer import FileTransferHandler | ||
|
|
||
|
|
||
| ADD_LOCAL_PRINTERS = envbool("XPRA_ADD_LOCAL_PRINTERS", False) | ||
| PRINTER_LOCATION_STRING = os.environ.get("XPRA_PRINTER_LOCATION_STRING", "via xpra") | ||
|
|
||
|
|
||
| class FilePrintMixin(FileTransferHandler): | ||
|
|
||
| def __init__(self): | ||
| self.printers = {} | ||
|
|
||
| def cleanup(self): | ||
| self.remove_printers() | ||
|
|
||
| def parse_client_caps(self, c): | ||
| pass | ||
|
|
||
| def get_caps(self): | ||
| return {} | ||
|
|
||
| def get_info(self): | ||
| return { | ||
| "printers" : self.printers, | ||
| "file-transfers" : FileTransferHandler.get_info(self), | ||
| } | ||
|
|
||
| ###################################################################### | ||
| # printing: | ||
| def set_printers(self, printers, password_file, auth, encryption, encryption_keyfile): | ||
| log("set_printers(%s, %s, %s, %s, %s) for %s", printers, password_file, auth, encryption, encryption_keyfile, self) | ||
| if self.machine_id==get_machine_id() and not ADD_LOCAL_PRINTERS: | ||
| self.printers = printers | ||
| log("local client with identical machine id,") | ||
| log(" not configuring local printers") | ||
| return | ||
| if not self.uuid: | ||
| log.warn("Warning: client did not supply a UUID,") | ||
| log.warn(" printer forwarding cannot be enabled") | ||
| return | ||
| from xpra.platform.pycups_printing import remove_printer | ||
| #remove the printers no longer defined | ||
| #or those whose definition has changed (and we will re-add them): | ||
| for k in tuple(self.printers.keys()): | ||
| cpd = self.printers.get(k) | ||
| npd = printers.get(k) | ||
| if cpd==npd: | ||
| #unchanged: make sure we don't try adding it again: | ||
| try: | ||
| del printers[k] | ||
| except: | ||
| pass | ||
| continue | ||
| if npd is None: | ||
| log("printer %s no longer exists", k) | ||
| else: | ||
| log("printer %s has been modified:", k) | ||
| log(" was %s", cpd) | ||
| log(" now %s", npd) | ||
| #remove it: | ||
| try: | ||
| del self.printers[k] | ||
| remove_printer(k) | ||
| except Exception as e: | ||
| log.error("Error: failed to remove printer %s:", k) | ||
| log.error(" %s", e) | ||
| del e | ||
| #expand it here so the xpraforwarder doesn't need to import anything xpra: | ||
| attributes = {"display" : os.environ.get("DISPLAY"), | ||
| "source" : self.uuid} | ||
| def makeabs(filename): | ||
| #convert to an absolute path since the backend may run as a different user: | ||
| return os.path.abspath(os.path.expanduser(filename)) | ||
| if auth: | ||
| auth_password_file = None | ||
| try: | ||
| name, authclass, authoptions = auth | ||
| auth_password_file = authoptions.get("file") | ||
| log("file for %s / %s: '%s'", name, authclass, password_file) | ||
| except Exception as e: | ||
| log.error("Error: cannot forward authentication attributes to printer backend:") | ||
| log.error(" %s", e) | ||
| if auth_password_file or password_file: | ||
| attributes["password-file"] = makeabs(auth_password_file or password_file) | ||
| if encryption: | ||
| if not encryption_keyfile: | ||
| log.error("Error: no encryption keyfile found for printing") | ||
| else: | ||
| attributes["encryption"] = encryption | ||
| attributes["encryption-keyfile"] = makeabs(encryption_keyfile) | ||
| #if we can, tell it exactly where to connect: | ||
| if self.unix_socket_paths: | ||
| #prefer sockets in public paths: | ||
| spath = self.unix_socket_paths[0] | ||
| for x in self.unix_socket_paths: | ||
| if x.startswith("/tmp") or x.startswith("/var") or x.startswith("/run"): | ||
| spath = x | ||
| attributes["socket-path"] = spath | ||
| log("printer attributes: %s", attributes) | ||
| for k,props in printers.items(): | ||
| if k not in self.printers: | ||
| self.setup_printer(k, props, attributes) | ||
|
|
||
| def setup_printer(self, name, props, attributes): | ||
| from xpra.platform.pycups_printing import add_printer | ||
| info = props.get("printer-info", "") | ||
| attrs = attributes.copy() | ||
| attrs["remote-printer"] = name | ||
| attrs["remote-device-uri"] = props.get("device-uri") | ||
| location = PRINTER_LOCATION_STRING | ||
| if self.hostname: | ||
| location = "on %s" | ||
| if PRINTER_LOCATION_STRING: | ||
| #ie: on FOO (via xpra) | ||
| location = "on %s (%s)" % (self.hostname, PRINTER_LOCATION_STRING) | ||
| try: | ||
| def printer_added(): | ||
| #once the printer has been added, register it in the list | ||
| #(so it will be removed on exit) | ||
| log.info("the remote printer '%s' has been configured", name) | ||
| self.printers[name] = props | ||
| add_printer(name, props, info, location, attrs, success_cb=printer_added) | ||
| except Exception as e: | ||
| log.warn("Warning: failed to add printer %s: %s", name, e) | ||
| log("setup_printer(%s, %s, %s)", name, props, attributes, exc_info=True) | ||
|
|
||
| def remove_printers(self): | ||
| if self.machine_id==get_machine_id() and not ADD_LOCAL_PRINTERS: | ||
| return | ||
| printers = self.printers.copy() | ||
| self.printers = {} | ||
| for k in printers: | ||
| from xpra.platform.pycups_printing import remove_printer | ||
| remove_printer(k) |