Browse Source

add engine debug color

PYADPT-55
Volker Birk 6 years ago
parent
commit
cabf730cae
  1. 10
      src/pEpmodule.cc
  2. 6
      test/sync_handshake.py
  3. 17
      utils/pEp

10
src/pEpmodule.cc

@ -113,6 +113,11 @@ namespace pEp {
{ {
adapter.shutdown_sync(); adapter.shutdown_sync();
} }
void debug_color(int ansi_color)
{
::set_debug_color(adapter.session(), ansi_color);
}
} }
} }
@ -370,7 +375,7 @@ BOOST_PYTHON_MODULE(pEp)
.def("__deepcopy__", &Message::deepcopy) .def("__deepcopy__", &Message::deepcopy)
.def("__copy__", &Message::copy); .def("__copy__", &Message::copy);
// basic API // basic API and key management API
def("update_identity", &pEp::PythonAdapter::update_identity, def("update_identity", &pEp::PythonAdapter::update_identity,
"update_identity(ident)\n" "update_identity(ident)\n"
@ -518,6 +523,9 @@ BOOST_PYTHON_MODULE(pEp)
"call this from another thread to shut down the sync thread\n" "call this from another thread to shut down the sync thread\n"
); );
def("debug_color", &pEp::PythonAdapter::debug_color,
"for debug builds set ANSI color value");
// codecs // codecs
call< object >(((object)(import("codecs").attr("register"))).ptr(), make_function(sync_search)); call< object >(((object)(import("codecs").attr("register"))).ptr(), make_function(sync_search));

6
test/sync_handshake.py

@ -132,6 +132,12 @@ def run(name, color=None):
if color: if color:
global output global output
output = lambda x: print(colored(x, color)) output = lambda x: print(colored(x, color))
if color == "red":
pEp.debug_color(31)
elif color == "green":
pEp.debug_color(32)
elif color == "cyan":
pEp.debug_color(36)
me = pEp.Identity("alice@peptest.ch", name + " of Alice Neuman", name) me = pEp.Identity("alice@peptest.ch", name + " of Alice Neuman", name)
pEp.myself(me) pEp.myself(me)

17
utils/pEp

@ -26,6 +26,8 @@ parser.add_argument('--decrypt', '-d', help='decrypt p≡p message',
action='store_true', dest='decrypt') action='store_true', dest='decrypt')
parser.add_argument('--import', '-i', help='import key data in PGP format', parser.add_argument('--import', '-i', help='import key data in PGP format',
action='store_true', dest='keyimport') action='store_true', dest='keyimport')
parser.add_argument('--export', '-x', help='export key data in PGP format',
action='store_true', dest='keyexport')
parser.add_argument('--version', '-V', help='show program version', parser.add_argument('--version', '-V', help='show program version',
action='store_true', dest='version') action='store_true', dest='version')
parser.add_argument('files', metavar='FILE', nargs='*', parser.add_argument('files', metavar='FILE', nargs='*',
@ -33,8 +35,8 @@ parser.add_argument('files', metavar='FILE', nargs='*',
args = parser.parse_args() args = parser.parse_args()
if not(args.encrypt) and not(args.decrypt) and not (args.keyimport) and not(args.version): if not(args.encrypt) and not(args.decrypt) and not (args.keyimport) and not (args.keyexport) and not(args.version):
print('use either --encrypt, --decrypt or --import', file=sys.stderr) print('use either --encrypt, --decrypt, --import or --export', file=sys.stderr)
sys.exit(2) sys.exit(2)
if args.version: if args.version:
@ -85,6 +87,17 @@ try:
except RuntimeError: except RuntimeError:
print("error importing key(s)", file=sys.stderr) print("error importing key(s)", file=sys.stderr)
elif args.keyexport:
if filename == '-':
text = sys.stdin.read()
else:
with open(filename, "rb") as f:
text = f.read()
try:
import_key(text)
except RuntimeError:
print("error exporting key(s)", file=sys.stderr)
except KeyboardInterrupt: except KeyboardInterrupt:
print('\n', file=sys.stderr) print('\n', file=sys.stderr)
sys.exit(1) sys.exit(1)

Loading…
Cancel
Save