From 6e244ed671998cda4e743714f71b17eb725bc681 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Wed, 18 Nov 2020 06:03:28 +0100
Subject: [PATCH] Improve output

---
 dialog.py              |  4 +--
 lib/cesiumMessaging.py |  7 ++--
 readmsg.sh             | 82 ------------------------------------------
 3 files changed, 6 insertions(+), 87 deletions(-)
 delete mode 100755 readmsg.sh

diff --git a/dialog.py b/dialog.py
index 836dbcc..d7e6a2b 100755
--- a/dialog.py
+++ b/dialog.py
@@ -21,5 +21,5 @@ args = parser.parse_args()
 messages = ReadCesium(dunikey, pod)
 messages.read(args.number, args.outbox)
 
-# For debug, print complete JSON answer
-# print(messages.sendDocument(args.number, args.outbox))
+# print(messages.sendDocument(args.number, args.outbox)) # For debug, print complete JSON answer
+
diff --git a/lib/cesiumMessaging.py b/lib/cesiumMessaging.py
index 984739d..2a4b3da 100755
--- a/lib/cesiumMessaging.py
+++ b/lib/cesiumMessaging.py
@@ -3,6 +3,7 @@
 import os, sys, requests, json, base58, base64
 from natools import fmt, sign, get_privkey, box_decrypt
 from datetime import datetime
+from termcolor import colored
 
 
 class ReadCesium:
@@ -70,7 +71,7 @@ class ReadCesium:
 
         self.total = msgJSON["total"]
         infoTotal = "  Nombre de messages: " + str(self.total) + "  "
-        print(infoTotal.center(rows, '#'))
+        print(colored(infoTotal.center(rows, '#'), "yellow"))
         for hits in msgJSON["hits"]:
             self.idMsg = hits["_id"]
             msgSrc = hits["_source"]
@@ -83,10 +84,10 @@ class ReadCesium:
             self.content = box_decrypt(self.content, get_privkey(self.dunikey, "pubsec"), self.issuer, nonce).decode()
             self.dateS = msgSrc["time"]
             date = datetime.fromtimestamp(self.dateS).strftime(", le %d/%m/%Y à %H:%M  ")
-            headerMsg = "  De " + self.issuer + date + "(ID: {})".format(self.idMsg)
+            headerMsg = "  De " + self.issuer + date + "(ID: {})".format(self.idMsg) + "  "
 
             print('-'.center(rows, '-'))
-            print(headerMsg.center(rows, '-'))
+            print(colored(headerMsg, "blue").center(rows+9, '-'))
             print('-'.center(rows, '-'))
             print("Objet: " + self.title)
             print(self.content)
diff --git a/readmsg.sh b/readmsg.sh
deleted file mode 100755
index b0e02fc..0000000
--- a/readmsg.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-
-# ###
-# Lecture des messages Cesium+
-# ###
-
-[[ -z $(which jq) || -z $(which curl) ]] && echo "Installation de jq et curl ..." && sudo apt update && sudo apt install jq curl -y
-
-[[ ! -f .env ]] && cp .env.template .env
-source .env
-
-# Help display
-helpOpt() {
-    echo -e "Cesium+ messages sender
-    \r$0
-    Default: ask recipient in interactive mode.
-    Advice: Fill your .env file for more fun.
-
-    \rOptions:
-    -k,--key <key>\t\tPath <key> to the pubsec keychain file of the issuer.
-    -n,--number <number>\tDisplay the <number> lasts messages from Cesium (tail-like format)
-    -o,--outbox\t\t\tRead outbox messages instead of inbox
-    -h,--help\t\t\tDisplay this help"
-}
-
-REGEX_PUBKEYS="[a-zA-Z0-9]{42,44}"
-
-recipient=$issuer
-
-# Parse options
-declare -a args=($@)
-for ((i=0; i<${#args[*]}; ++i))
-do
-    case ${args[$i]} in
-        -k|--key) dunikey="${args[$i+1]}"
-            [[ -z $dunikey ]] && echo "Veuillez préciser un fichier de trousseau." && exit 1;;
-        -o|--outbox) type=outbox;;
-        -n|--number) nbrRaw="${args[$i+1]}";;
-        -n*) nbrRaw="${args[$i]:2}";;
-        -h|--help) helpOpt && exit 0;;
-        *) [[ "${args[$i]}" == "-"* ]] && echo "Option inconnue." && exit 1;;
-    esac
-done
-
-
-recipient=$(./natools.py pk -f pubsec -k $dunikey)
-if [[ -z $dunikey ]]; then
-    read -p "Fichier de trousseau: " dunikey
-fi
-[[ -z $type ]] && type="inbox"
-[[ -z $nbrRaw ]] && nbrRaw=5000
-
-[[ -z $(grep -Eo $REGEX_PUBKEYS <<<$recipient) ]] && echo "Le format de la clé publique du destinataire est invalide." && exit 1
-
-document="{\"sort\":{\"time\":\"desc\"},\"from\":0,\"size\":$nbrRaw,\"_source\":[\"issuer\",\"recipient\",\"title\",\"content\",\"time\",\"nonce\",\"read_signature\"],\"query\":{\"bool\":{\"filter\":{\"term\":{\"recipient\":\"$recipient\"}}}}}"
-
-# Envoi du document
-msgContent=$(curl -s -X POST "$pod/message/$type/_search" -d "$document" | jq .hits.hits[]._source -c)
-
-#Traitement des données
-n=0
-for i in $msgContent; do
-    echo -e "=== $n ===\n"
-    dataObj=($(jq -r '.issuer,.recipient,.nonce,.title,.content,.time' <<<"$i"))
-    issuer="${dataObj[0]}"
-    recipient="${dataObj[1]}"
-    nonce=$(echo "${dataObj[2]}" | base58 -d | base64 -w 0)
-    title="${dataObj[3]}"
-    content="${dataObj[4]}"
-    time="${dataObj[5]}"
-
-    titleClear=$(./natools.py box-decrypt -p $issuer -f pubsec -k $dunikey -n $nonce -I 64 <<< "${title}")
-    contentClear=$(./natools.py box-decrypt -p $issuer -f pubsec -k $dunikey -n $nonce -I 64 <<< "${content}")
-    echo "$titleClear"
-    echo "$contentClear"
-    echo "========="
-    ((n++))
-#    echo "./natools.py box-decrypt -p $issuer -f pubsec -k $dunikey -n $nonce -I 64 <<< \"${title}\""
-done
-
-#echo "$msgContent" | jq
-