zlax/sshch
zlax
/
sshch
1
0
Fork 0
Code Issues Pull Requests Releases 2 Activity

Merge pull request #3 from GHPS/master 

Added Python 3.x support
This commit is contained in:
ivan 2017-11-20 09:57:30 +03:00 committed by GitHub
parent e75a733d0b 68bb493c44
commit 2c8f072499
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
sshch/sshch
View File

@ -1,22 +1,26 @@
#!/usr/bin/env python #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
from __future__ import division from __future__ import division
from __future__ import print_function
try:
import configparser
except ImportError:
import ConfigParser as configparser # Python 2.x import
from os import path from os import path
from sys import argv from sys import argv
from math import ceil from math import ceil
from getpass import getpass from getpass import getpass
from optparse import OptionParser from optparse import OptionParser
from curses import textpad, panel
import ConfigParser
import subprocess import subprocess
import base64 import base64
import curses
import time import time
import curses
from curses import textpad, panel
# https://github.com/zlaxy/sshch # https://github.com/zlaxy/sshch
version = "0.8" version = "0.9"
# path to conf file, default: ~/.config/sshch.conf # path to conf file, default: ~/.config/sshch.conf
conf_file = path.expanduser("~") + '/.config/sshch.conf' conf_file = path.expanduser("~") + '/.config/sshch.conf'
@ -63,7 +67,7 @@ def ConnectAlias(alias, command=False):
def HoldConnection(alias): def HoldConnection(alias):
print "Connecting to " + alias + ". Press CTRL+C to cancel." print("Connecting to " + alias + ". Press CTRL+C to cancel.")
time.sleep(1) time.sleep(1)
while True: while True:
ConnectAlias(alias) ConnectAlias(alias)
@ -77,10 +81,10 @@ def CMDAdd(alias):
"(example: ssh user@somehost.com):\n"])) "(example: ssh user@somehost.com):\n"]))
string = "" string = ""
while string == "": while string == "":
string = raw_input(prompt_add) string = input(prompt_add)
SetAliasString(alias, string) SetAliasString(alias, string)
else: else:
print result print(result)
def CMDEdit(alias): def CMDEdit(alias):
@ -89,10 +93,10 @@ def CMDEdit(alias):
"(example: ssh user@somehost.com):\n"])) "(example: ssh user@somehost.com):\n"]))
string = "" string = ""
while string == "": while string == "":
string = raw_input(prompt_edit) string = input(prompt_edit)
SetAliasString(alias, string) SetAliasString(alias, string)
else: else:
print "error: '" + alias + "' alias is not exists" print("error: '" + alias + "' alias is not exists")
def CMDPassword(alias): def CMDPassword(alias):
@ -103,38 +107,38 @@ def CMDPassword(alias):
if not string == "": if not string == "":
SetPassword(alias, string) SetPassword(alias, string)
else: else:
print "error: '" + alias + "' alias is not exists" print("error: '" + alias + "' alias is not exists")
def CMDRemove(alias): def CMDRemove(alias):
if conf.has_section(alias): if conf.has_section(alias):
prompt_remove = ("Type 'yes' if you sure to remove '" + alias + "' alias: ") prompt_remove = ("Type 'yes' if you sure to remove '" + alias + "' alias: ")
string = raw_input(prompt_remove) string = input(prompt_remove)
if string == "yes": if string == "yes":
RemoveAliases([alias]) RemoveAliases([alias])
else: else:
print "'" + alias + "' alias was not deleted." print("'" + alias + "' alias was not deleted.")
else: else:
print "error: '" + alias + "' alias is not exists." print("error: '" + alias + "' alias is not exists.")
def CMDConnect(aliases, command=False): def CMDConnect(aliases, command=False):
for alias in aliases: for alias in aliases:
if conf.has_section(alias): if conf.has_section(alias):
print "Connecting to " + alias + "..." print("Connecting to " + alias + "...")
ConnectAlias(alias, command) ConnectAlias(alias, command)
print "... " + alias + " session finished." print("... " + alias + " session finished.")
else: else:
print "error: '" + alias + "' alias is not exists" print("error: '" + alias + "' alias is not exists")
def CMDList(option, opt, value, parser): def CMDList(option, opt, value, parser):
print ', '.join(str(p) for p in conf.sections()) print(', '.join(str(p) for p in conf.sections()))
def CMDFullList(option, opt, value, parser): def CMDFullList(option, opt, value, parser):
for p in conf.sections(): for p in conf.sections():
to_print = "".join([str(p), " - ", (conf.get(p, "exec_string") if to_print = "".join([str(p), " - ", (conf.get(p, "exec_string") if
conf.has_option(p, "exec_string") else ""), conf.has_option(p, "exec_string") else ""),
(" [password]" if conf.has_option(p, "password") else "")]) (" [password]" if conf.has_option(p, "password") else "")])
print(to_print) print(to_print)
@ -143,17 +147,17 @@ def CMDFullList(option, opt, value, parser):
def CursesConnect(screen, aliases, command=False): def CursesConnect(screen, aliases, command=False):
curses.endwin() curses.endwin()
for alias in aliases: for alias in aliases:
print "Connecting to " + alias + "..." print("Connecting to " + alias + "...")
ConnectAlias(alias, command) ConnectAlias(alias, command)
print "... " + alias + " session finished." print("... " + alias + " session finished.")
print "Press 'enter' to continue." print("Press 'enter' to continue.")
screen.getch() screen.getch()
def CursesExit(error=False): def CursesExit(error=False):
curses.endwin() curses.endwin()
if error: if error:
print error print(error)
exit() exit()
@ -556,7 +560,12 @@ def CursesMain():
if __name__ == "__main__": if __name__ == "__main__":
conf = ConfigParser.RawConfigParser() try:
input = raw_input # Fix for Python 2.x
except NameError:
pass
conf = configparser.RawConfigParser()
if not path.exists(conf_file): if not path.exists(conf_file):
open(conf_file, 'w') open(conf_file, 'w')
conf.read(conf_file) conf.read(conf_file)
@ -565,15 +574,15 @@ if __name__ == "__main__":
CMDOptions() CMDOptions()
except KeyboardInterrupt: except KeyboardInterrupt:
exit() exit()
except ConfigParser.Error: except configparser.Error:
print ("Error: can't parse your config file, please check it manually or make new one") print("Error: can't parse your config file, please check it manually or make new one")
exit() exit()
else: else:
try: try:
CursesMain() CursesMain()
except KeyboardInterrupt: except KeyboardInterrupt:
CursesExit() CursesExit()
except ConfigParser.NoOptionError: except configparser.NoOptionError:
CursesExit("".join(["Error: can't parse your config file, please ", CursesExit("".join(["Error: can't parse your config file, please ",
"check it manually or make new one"])) "check it manually or make new one"]))
except curses.error: except curses.error: