x2go-commits

x2go-commits@lists.x2go.org

37910 discussions

[x2goclient] 06/94: * pyhoca-cli is currently broken... * temporarily removed symlinks to local Python X2go copy * initial bugfixing
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit a492d5941429c3179caa4bbe99a9534ac622f3cc Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Fri Oct 29 12:21:30 2010 +0000 * pyhoca-cli is currently broken... * temporarily removed symlinks to local Python X2go copy * initial bugfixing git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@16 cdb5e8f1-f799-4276-8919-bce57fd91830 --- pyhoca-cli | 13 ++++++------- pyhoca/cli/frontend.py | 6 ++++-- pyhoca/cli/x2go | 1 - x2go | 1 - 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pyhoca-cli b/pyhoca-cli index fdda7332..632c0fa9 100755 --- a/pyhoca-cli +++ b/pyhoca-cli @@ -45,7 +45,7 @@ from x2go.defaults import DEFAULT_PDFVIEW_CMD from x2go.defaults import DEFAULT_PDFSAVE_LOCATION from x2go.defaults import DEFAULT_PRINTCMD_CMD -from pyhoca.cli import PyHocaCLI +from pyhoca.cli import current_home, PyHocaCLI # version information PROG_NAME = os.path.basename(sys.argv[0]) @@ -61,7 +61,6 @@ VERSION: %s """ % (PROG_NAME, PROG_PID, VERSION) PRINT_ACTIONS = X2GO_PRINT_ACTIONS.keys() -print_actions_args = {} logger = x2go.X2goLogger(tag='MAIN') liblogger = x2go.X2goLogger() @@ -138,7 +137,6 @@ def version(): def parseargs(): global DEBUG - global print_action_args global logger p = argparse.ArgumentParser(description='X2go command line client implemented in Python.',\ @@ -234,14 +232,15 @@ Possible values for the --pack NX option are: if a.print_cmd is None and a.print_action == 'PRINTCMD': a.print_cmd = DEFAULT_PRINTCMD_CMD + a.print_action_args = {} if a.pdfview_cmd: - print_action_args={'pdfview_cmd': a.pdfview_cmd, } + a.print_action_args={'pdfview_cmd': a.pdfview_cmd, } elif a.save_to_folder: - print_action_args={'save_to_folder': a.save_to_folder, } + a.print_action_args={'save_to_folder': a.save_to_folder, } elif a.printer: - print_action_args={'printer': a.printer, } + a.print_action_args={'printer': a.printer, } elif a.print_cmd: - print_action_args={'print_cmd': a.print_cmd, } + a.print_action_args={'print_cmd': a.print_cmd, } ### take care of compatibility options # option --use-sound yes as synonomyn for --sound diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py index 7c41b537..15a85d74 100644 --- a/pyhoca/cli/frontend.py +++ b/pyhoca/cli/frontend.py @@ -162,11 +162,13 @@ class PyHocaCLI(x2go.X2goClient): self.args = args if logger is None: logger = x2go.X2goLogger(tag='PyHocaCLI') + else: + self.logger = logger # initialize the X2goClient context and start the connection to the X2go server self.logger('preparing requested X2go session', x2go.loglevel_NOTICE, ) - x2go.X2goClient.__init__(logger=liblogger) + x2go.X2goClient.__init__(self, logger=liblogger) self.x2go_session_hash = self.register_session(args.server, port=int(self.args.remote_ssh_port), username=self.args.username, password=self.args.password, @@ -183,7 +185,7 @@ class PyHocaCLI(x2go.X2goClient): snd_system=self.args.sound, printing=self.args.printing, print_action=self.args.print_action, - print_action_args=print_action_args, + print_action_args=self.args.print_action_args, cmd=self.args.command) self.with_session(self.x2go_session_hash).load_host_keys(ssh_known_hosts_filename) diff --git a/pyhoca/cli/x2go b/pyhoca/cli/x2go deleted file mode 120000 index 6c7076fe..00000000 --- a/pyhoca/cli/x2go +++ /dev/null @@ -1 +0,0 @@ -../../../../python/python-x2go/trunk/x2go/ \ No newline at end of file diff --git a/x2go b/x2go deleted file mode 120000 index 74dfe276..00000000 --- a/x2go +++ /dev/null @@ -1 +0,0 @@ -../../python/python-x2go/trunk/x2go/ \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 03/94: * an example skeleton (not functional yet) for a common file hierarchy for PyHoca CLI+GUI
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit 8a10b824dc099927a08d52c77aa00df5b8021264 Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Thu Oct 28 17:19:51 2010 +0000 * an example skeleton (not functional yet) for a common file hierarchy for PyHoca CLI+GUI git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@12 cdb5e8f1-f799-4276-8919-bce57fd91830 --- README | 2 ++ TODO | 1 + debian/control | 6 +++--- man/pyhoca-cli.1 | 7 ++++--- pyhoca/__init__.py | 0 pyhoca/cli/__init.py__ | 23 +++++++++++++++++++++++ pyhoca/cli/frontend.py | 24 ++++++++++++++++++++++++ pyhoca/cli/x2go | 1 + setup.py | 34 ++++++++++++++++++++++++++++++++++ 9 files changed, 92 insertions(+), 6 deletions(-) diff --git a/README b/README index 902cce5a..67346f79 100644 --- a/README +++ b/README @@ -2,6 +2,7 @@ pyhoca-cli - Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Contributors: Jörg Sawatzki <joerg.sawatzki(a)web.de> + Dick Kniep <dick.kniep(a)lindix.nl> Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. @@ -34,6 +35,7 @@ Please refer to the man page: man pyhoca-cli === Known issues === + Please refer to the TODO file that has been shipped with pyhoca-cli. diff --git a/TODO b/TODO index 0be537da..fd05d7ea 100644 --- a/TODO +++ b/TODO @@ -2,6 +2,7 @@ pyhoca-cli - Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> Contributors: Jörg Sawatzki <joerg.sawatzki(a)web.de> + Dick Kniep <dick.kniep(a)lindix.nl> Published under the terms of the GNU General Public License. See http://www.gnu.org/licenses/gpl.html for a recent copy. diff --git a/debian/control b/debian/control index 79179389..eb220a8d 100644 --- a/debian/control +++ b/debian/control @@ -8,8 +8,8 @@ Homepage: http://das-netzwerkteam.de/site/?q=node/71 XS-Python-Version: all Package: pyhoca-cli +Replaces: pyhoca-cli Architecture: all Depends: ${misc:Depends}, python, python-x2go (>=0.0.14-0~nwt1), python-argparse -Description: X2go client written in Python - A fully functional X2go client implementation written - in Python. +Description: An command line X2go client written in Python + A command line X2go client implementation written in Python. diff --git a/man/pyhoca-cli.1 b/man/pyhoca-cli.1 index 79fae870..3b36454c 100644 --- a/man/pyhoca-cli.1 +++ b/man/pyhoca-cli.1 @@ -22,7 +22,8 @@ pyhoca-cli \- X2go command line client written in Python .ad b 'hy .SH DESCRIPTION -\fBpyhoca-cli\fR is an X2go command line client written in Python. +\fBpyhoca-cli\fR aims to be a cross-platform (Windows, Mac OS X, Linux) X2go command line client written +in Python. .PP You can use it for scripting remote X2go sessions or simply starting, resuming or shadowing X2go sessions from @@ -49,7 +50,7 @@ Enable debugging output. Enable debugging code of the unterlying Python X2go module. .TP \*(T<\fB\-\-libdebug-sftpxfer\fR\*(T> -Enable debugging code of Python X2go\'s sFTP server code (very verbose, and it may even reveal promiscuous data). +Enable debugging code of Python X2go's sFTP server code (very verbose, and it may even reveal promiscuous data). .SH SERVER .TP \*(T<\fB\-\-server\fR \fI<HOSTNAME_or_IP>\fR\*(T> @@ -171,4 +172,4 @@ rfb-hextile, rfb-tight, rfb-tight-compressed .SH "SEE ALSO" \fB/usr/share/doc/python-x2go\fR .SH AUTHOR -This manual has been written by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +This manual has been written by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de>. diff --git a/pyhoca/__init__.py b/pyhoca/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/pyhoca/cli/__init.py__ b/pyhoca/cli/__init.py__ new file mode 100644 index 00000000..aa21dc44 --- /dev/null +++ b/pyhoca/cli/__init.py__ @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2010 by Dick Kniep <m.gabriel(a)das-netzwerkteam.de> +# +# PyHoca CLI is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# PyHoca CLI is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +"""\ +STILL UNDOCUMENTED +""" +from frontend import * \ No newline at end of file diff --git a/pyhoca/cli/frontend.py b/pyhoca/cli/frontend.py new file mode 100644 index 00000000..47a11461 --- /dev/null +++ b/pyhoca/cli/frontend.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- + +# Copyright (C) 2010 by Dick Kniep <dick.kniep(a)lindix.nl> +# +# PyHoca CLI is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# PyHoca CLI is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +"""\ +STILL UNDOCUMENTED +""" + +class ... diff --git a/pyhoca/cli/x2go b/pyhoca/cli/x2go new file mode 120000 index 00000000..b7003701 --- /dev/null +++ b/pyhoca/cli/x2go @@ -0,0 +1 @@ +../../../../python/python-x2go/trunk/x2go \ No newline at end of file diff --git a/setup.py b/setup.py new file mode 100755 index 00000000..a257db18 --- /dev/null +++ b/setup.py @@ -0,0 +1,34 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +# Copyright (C) 2010 by Mike Gabriel <m.gabriel(a)das-netzwerkteam.de> +# +# PyHoca is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# PyHoca is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +from setuptools import setup, find_packages +import pyhoca.cli + +setup( + name = "pyhoca-cli", + version = pyhoca.cli.__VERSION__, + description = "PyHoca CLI is a cross-platform (Windows, MacOS X, Linux) X2go client for the command line.", + license = 'GPL', + author = 'Mike Gabriel', + url = 'http://www.x2go.org', + packages = find_packages('.'), + package_dir = {'': '.'}, + install_requires = ['setuptools', ] +) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[x2goclient] 02/94: * added folder for pyhoca-cli based GUI (name may still change)
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a commit to annotated tag 0.1.4.0 in repository x2goclient. commit f5102f6a31df1d0a42c5fee5d773fbe1775ee34c Author: mike <mike@cdb5e8f1-f799-4276-8919-bce57fd91830> Date: Sun Oct 24 16:05:49 2010 +0000 * added folder for pyhoca-cli based GUI (name may still change) git-svn-id: https://svn.das-netzwerkteam.de/x2go/pyhoca-cli/trunk@5 cdb5e8f1-f799-4276-8919-bce57fd91830 --- x2go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/x2go b/x2go index 64abb4d8..3e762901 120000 --- a/x2go +++ b/x2go @@ -1 +1 @@ -../../../python/python-x2go/trunk/x2go \ No newline at end of file +../../python/python-x2go/trunk/x2go \ No newline at end of file -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 0

[python-x2go] branch master updated (d5f230e -> 09d1a45)
by git-admin＠x2go.org 15 Dec '23

15 Dec '23

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository python-x2go. from d5f230e Continue development new 09d1a45 x2go/backends/terminal/plain.py: Typo fix in docstring. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 3 ++- x2go/backends/terminal/plain.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git

1 1

[[X2Go Wiki]] file uploaded: events:workadventure_meetingroom.png
by wiki-admin＠x2go.org 04 Dec '23

04 Dec '23

A file was uploaded to your DokuWiki. Here are the details: File : https://wiki.x2go.org/lib/exe/fetch.php/events:workadventure_meetingroom.pn… Old revision: --- Date : 2023/12/04 17:02 Browser : Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/119.0.0.0 Safari/537.36 IP-Address : 178.202.75.45 Hostname : ip-178-202-075-045.um47.pools.vodafone-ip.de Size : 118.7 KB MIME Type : png User : stefanbaur -- This mail was generated by DokuWiki at https://wiki.x2go.org/

1 0

[x2goclient] branch master updated (c5db2df -> 88a01f2)
by git-admin＠x2go.org 16 Nov '23

16 Nov '23

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from c5db2df debian/changelog: fixup. new 88a01f2 Fix crashes in broker mode when server key check has failed The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 1 + src/onmainwindow.cpp | 64 ++++++++++++++++------------------------------------ src/onmainwindow.h | 2 +- 3 files changed, 22 insertions(+), 45 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 1

[[X2Go Wiki]] file uploaded: events:it_kongress_2023.jpg
by wiki-admin＠x2go.org 11 Nov '23

11 Nov '23

A file was uploaded to your DokuWiki. Here are the details: File : https://wiki.x2go.org/lib/exe/fetch.php/events:it_kongress_2023.jpg?rev=169… Old revision: --- Date : 2023/11/11 21:16 Browser : Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/118.0.0.0 Safari/537.36 IP-Address : 178.202.75.45 Hostname : ip-178-202-075-045.um47.pools.vodafone-ip.de Size : 228.2 KB MIME Type : jpg User : stefanbaur -- This mail was generated by DokuWiki at https://wiki.x2go.org/

1 0

[[X2Go Wiki]] file uploaded: events:linuxday_at_2023_img_20230930_125037373.jpg
by wiki-admin＠x2go.org 09 Oct '23

09 Oct '23

A file was uploaded to your DokuWiki. Here are the details: File : https://wiki.x2go.org/lib/exe/fetch.php/events:linuxday_at_2023_img_2023093… Old revision: --- Date : 2023/10/09 19:49 Browser : Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 IP-Address : 178.202.75.45 Hostname : ip-178-202-075-045.um47.pools.vodafone-ip.de Size : 2.2 MB MIME Type : jpg User : stefanbaur -- This mail was generated by DokuWiki at https://wiki.x2go.org/

1 0

[[X2Go Wiki]] file uploaded: events:linuxday_at_2023_img_20230930_061923854.jpg
by wiki-admin＠x2go.org 09 Oct '23

09 Oct '23

A file was uploaded to your DokuWiki. Here are the details: File : https://wiki.x2go.org/lib/exe/fetch.php/events:linuxday_at_2023_img_2023093… Old revision: --- Date : 2023/10/09 19:49 Browser : Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/117.0.0.0 Safari/537.36 IP-Address : 178.202.75.45 Hostname : ip-178-202-075-045.um47.pools.vodafone-ip.de Size : 1.1 MB MIME Type : jpg User : stefanbaur -- This mail was generated by DokuWiki at https://wiki.x2go.org/

1 0

[x2goclient] branch master updated (e148990 -> c5db2df)
by git-admin＠x2go.org 26 Sep '23

26 Sep '23

This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from e148990 In direct RDP mode, when using broker, forward username and password to the RDP client if user enetered any. new 36a1a7a x2goclient.spec: add Recommends: x2gokdriveclient for FC30+, RH 8+, *SuSE 15.4+. new c5db2df debian/changelog: fixup. The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 16 ++++++++++------ x2goclient.spec | 3 +++ 2 files changed, 13 insertions(+), 6 deletions(-) -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goclient.git

1 2

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

x2go-commits