[gtk-vnc] gvncviewer.py: suppress noisy output
- From: Daniel P. Berrange <dberrange src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk-vnc] gvncviewer.py: suppress noisy output
- Date: Tue, 8 Dec 2020 14:30:14 +0000 (UTC)
commit bc9d2cbdd8a133efcad43dbbe319ddf811981cee
Author: Dr. Matthias St. Pierre <matthias st pierre ncp-e com>
Date: Fri Oct 23 01:03:36 2020 +0200
gvncviewer.py: suppress noisy output
Don't print anything to stdout unless the `--verbose (-v)`
option is provided.
examples/gvncviewer.py | 45 +++++++++++++++++++++++++++++----------------
1 file changed, 29 insertions(+), 16 deletions(-)
---
diff --git a/examples/gvncviewer.py b/examples/gvncviewer.py
index f646f1b..e206eb6 100755
--- a/examples/gvncviewer.py
+++ b/examples/gvncviewer.py
@@ -40,6 +40,19 @@ if len(sys.argv) != 2 and len(sys.argv) != 3:
print(usage)
sys.exit(1)
+
+# a fancy 'print_nothing' lambda function
+info = lambda *args, **kwargs : None
+
+if "-v" in sys.argv:
+ info = print
+ sys.argv.remove("-v")
+
+if "--verbose" in sys.argv:
+ info = print
+ sys.argv.remove("--verbose")
+
+
import gi
gi.require_version('Gtk', '3.0')
gi.require_version('GtkVnc', '2.0')
@@ -68,12 +81,12 @@ def vnc_screenshot(src, ev, vnc):
if ev.keyval == Gdk.KEY_F11:
pix = vnc.get_pixbuf()
pix.savev("gvncviewer.png", "png", ["tEXt::Generator App"], ["gvncviewer.py"])
- print("Screenshot saved to gvncviewer.png")
+ info("Screenshot saved to gvncviewer.png")
return False
def vnc_close(src, window, data = None):
- print("Window closed by user")
+ info("Window closed by user")
Gtk.main_quit()
def vnc_grab(src, window):
@@ -83,46 +96,46 @@ def vnc_ungrab(src, window):
set_title(src, window, False)
def vnc_connected(src):
- print("Connected to server")
+ info("Connected to server")
def vnc_initialized(src, window):
- print("Connection initialized")
+ info("Connection initialized")
set_title(src, window, False)
window.show_all()
def vnc_disconnected(src):
- print("Disconnected from server")
+ info("Disconnected from server")
Gtk.main_quit()
def send_caf1(src, vnc):
- print("Send Ctrl+Alt+F1")
+ info("Send Ctrl+Alt+F1")
vnc.send_keys([Gdk.KEY_Control_L, Gdk.KEY_Alt_L, Gdk.KEY_F1])
def send_caf2(src, vnc):
- print("Send Ctrl+Alt+F2")
+ info("Send Ctrl+Alt+F2")
vnc.send_keys([Gdk.KEY_Control_L, Gdk.KEY_Alt_L, Gdk.KEY_F2])
def send_caf3(src, vnc):
- print("Send Ctrl+Alt+F3")
+ info("Send Ctrl+Alt+F3")
vnc.send_keys([Gdk.KEY_Control_L, Gdk.KEY_Alt_L, Gdk.KEY_F3])
def send_caf7(src, vnc):
- print("Send Ctrl+Alt+F7")
+ info("Send Ctrl+Alt+F7")
vnc.send_keys([Gdk.KEY_Control_L, Gdk.KEY_Alt_L, Gdk.KEY_F7])
def send_cad(src, vnc):
- print("Send Ctrl+Alt+Del")
+ info("Send Ctrl+Alt+Del")
vnc.send_keys([Gdk.KEY_Control_L, Gdk.KEY_Alt_L, Gdk.KEY_Delete])
def send_cab(src, vnc):
- print("Send Ctrl+Alt+BackSpace")
+ info("Send Ctrl+Alt+BackSpace")
vnc.send_keys([Gdk.KEY_Control_L, Gdk.KEY_Alt_L, Gdk.KEY_BackSpace])
def vnc_auth_cred(src, credList):
prompt = 0
data = []
- print(type(credList))
+ info(type(credList))
for i in range(credList.n_values):
data.append(None)
if credList.get_nth(i) in (GtkVnc.DisplayCredential.USERNAME, GtkVnc.DisplayCredential.PASSWORD):
@@ -174,10 +187,10 @@ def vnc_auth_cred(src, credList):
for i in range(credList.n_values):
if i < len(data) and data[i] != None:
if src.set_credential(credList.get_nth(i), data[i]):
- print("Cannot set credential type %d" % (credList.get_nth(i)))
+ info("Cannot set credential type %d" % (credList.get_nth(i)))
src.close()
else:
- print("Unsupported credential type %d" % (credList.get_nth(i)))
+ info("Unsupported credential type %d" % (credList.get_nth(i)))
src.close()
window = Gtk.Window()
@@ -247,11 +260,11 @@ else:
if host == "unix":
import socket
domain_socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM, 0)
- print("Connecting to domain socket", path)
+ info("Connecting to domain socket", path)
domain_socket.connect(path)
vnc.open_fd(domain_socket.fileno())
else:
- print("Connecting to %s:%s" % (host, port))
+ info("Connecting to %s:%s" % (host, port))
vnc.open_host(host, port)
vnc.connect("vnc-pointer-grab", vnc_grab, window)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]