This commit is contained in:
2019-06-27 17:51:59 +02:00
parent f5c4f59263
commit ada3b9a6d2
7 changed files with 56 additions and 335 deletions

View File

@@ -1,5 +1,5 @@
#!/usr/bin/python3
# Version 0.61
# Version 0.7
import easygui
import configparser
import json
@@ -8,6 +8,9 @@ import subprocess, platform
import hashlib #SHA256
from translation import T
passha256 = None # Password (Global)
def ping(host):
"""
Returns True if host (str) responds to a ping request.
@@ -29,8 +32,15 @@ def sendmenudot(text,title,choices):
## showchoicesapi, suburl has to have params (NOT inlcuding server part)
def showchoicesapi(text,title,suburl,field='Name'):
global c_server
global passha256
if 'Password=' in suburl:
twopart = ""
elif '?' in suburl:
twopart = '&Password='+str(passha256)
else:
twopart= '?Password='+str(passha256)
try:
jsonobj = json.loads(requests.get(c_server+suburl).text)
jsonobj = json.loads(requests.get(c_server+suburl+twopart).text)
listitems = []
for ite in jsonobj:
listitems.append(ite[field])
@@ -41,8 +51,15 @@ def showchoicesapi(text,title,suburl,field='Name'):
def sendsettoapi(suburl,goodtext): # Send a add/del/modify to API. Doesn't return more than "Valid" and "Not valid"
global c_server
global passha256
if 'Password=' in suburl:
twopart = ""
elif '?' in suburl:
twopart = '&Password='+str(passha256)
else:
twopart= '?Password='+str(passha256)
try:
jsonobj = json.loads(requests.get(c_server+suburl).text)
jsonobj = json.loads(requests.get(c_server+suburl+twopart).text)
#jsonobj['RESULT'] has to exist for next if
try:
jsonobj['RESULT']
@@ -63,8 +80,15 @@ def sendsettoapi(suburl,goodtext): # Send a add/del/modify to API. Doesn't retur
def returnvalueapi(suburl,field="Name"):
global c_server
global passha256
if 'Password=' in suburl:
twopart = ""
elif '?' in suburl:
twopart = '&Password='+str(passha256)
else:
twopart= '?Password='+str(passha256)
try:
jsonobj = json.loads(requests.get(c_server+suburl).text)
jsonobj = json.loads(requests.get(c_server+suburl+twopart).text)
return jsonobj[field]
except:
easygui.msgbox(msg='Error en la aplicación al consultar', title="Error", ok_button='OK')