lm
/
Grail
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity

1. Add Nextcloud as upload option 

2. Rewrite ini file with inline comments
3. Fix local Upload

v. 0.6
This commit is contained in:
Lukas 2021-05-22 21:20:11 +02:00
parent 3d9f3d6cf3
commit c94a7276be
2 changed files with 137 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -1,10 +1,13 @@
# Grail # Grail(cloud)
* Version: 0.5.1 * Version: 0.5.1
* Date: 16.01.2021 * Date: 16.01.2021
********************************* *********************************
Instant Upload Screenshot-Tool based on the idea of Gyazoo. Instant Upload Screenshot-Tool based on the idea of Gyazoo.
[This needs a settings.ini containing credentials]
**->MS Windows only!** **->MS Windows only!**
********************************* *********************************
[Precompiled Download](https://git.lukasmahler.de/attachments/92de34c2-faf6-473d-87a0-0e885809540b "download") [Precompiled Download](https://git.lukasmahler.de/attachments/92de34c2-faf6-473d-87a0-0e885809540b "download")

176
grail.py
View File

@ -1,7 +1,7 @@
__author__ = "Lukas Mahler" __author__ = "Lukas Mahler"
__copyright__ = "Copyright 2018-2021" __copyright__ = "Copyright 2018-2021"
__version__ = "0.5.1" __version__ = "0.6.0"
__date__ = "16.01.2021" __date__ = "22.05.2021"
__email__ = "lm@ankerlab.de" __email__ = "lm@ankerlab.de"
__status__ = "Development" __status__ = "Development"
@ -12,6 +12,7 @@ try:
import sys import sys
import webbrowser import webbrowser
from io import BytesIO from io import BytesIO
from requests import head
from shutil import rmtree from shutil import rmtree
from getpass import getpass from getpass import getpass
from tempfile import gettempdir from tempfile import gettempdir
@ -25,6 +26,7 @@ try:
from fillscreen import Ui_View from fillscreen import Ui_View
# Customs # Customs
import owncloud
import win32gui import win32gui
import win32clipboard import win32clipboard
import paramiko import paramiko
@ -121,42 +123,70 @@ class Fillscreen(QtWidgets.QWidget, Ui_View):
################################################################################################### ###################################################################################################
################################################################################################### ###################################################################################################
def sslurl(url, ssl):
if ssl:
url = "https://" + url
else:
url = "http://" + url
return url
def read_ini(rootdir): def read_ini(rootdir):
myini = {} myini = {}
config = ConfigParser() config = ConfigParser(inline_comment_prefixes=";")
try: try:
config.read_file(open(rootdir+'settings.ini')) config.read_file(open(rootdir + 'settings.ini'))
except Exception as e: except FileNotFoundError:
print("ERROR: Couldn't locate a 'settings.ini' |||", e) print("ERROR: Couldn't locate a 'settings.ini'")
print("--> Trying to create new blank one.")
# Creating new blank ini # Creating new blank ini
with open(rootdir+'settings.ini', 'w') as f: with open(rootdir + 'settings.ini', 'w') as f:
txt = "[MAIN]\n" \ txt = (
"# MODE EITHER ONLINE OR OFFLINE\nMODE = OFFLINE\n\n\n" \ "# MAIN SETTINGS\n"
"# IF MODE IS ONLINE PROVIDE THE SFTP INFO BELOW\n" \ "[MAIN]\n"
"[ONLINE]\n\n" \ "MODE = LOCAL ; MODE EITHER SFTP, NEXTCLOUD OR LOCAL\n"
"# URL EITHER IS AN IP OR A FQDN\nURL = \n\n" \ "TIMEOUT = 5 ; TIMEOUT WHEN TESTING SFTP CONNECTION\n"
"# PORT IS THE SSH PORT\nPORT = 22\n\n" \ "SSL = TRUE ; USING HTTP (FALSE) OR HTTPS (TRUE) URLS\n"
"# THE TIME IN SECONDS TO TRY TO CONNECT\nTIMEOUT = 5\n\n" \ "\n"
"# YOUR SSH USER, THIS CAN BE BLANK TO GET ASKED INTERACTIVELY\nUSR = \nPASS = \n\n" \ "# PROVIDE SFTP INFO BELOW\n"
"# THE LOCAL SERVER PATH WHERE TO PUT THE SCREENSHOT\nPTH = ./Screens/\n\n" \ "[SFTP]\n"
"# THIS SHOULD BE THE FULL ONLINE URL\nWHERE = \n\n\n" \ "URL = ; URL EITHER IS AN IP OR A FQDN\n"
"# IF MODE IS OFFLINE YOU MAY CHANGE THE SETTINGS BELOW\n" \ "PORT = ; PORT IS THE SSH PORT\n"
"[OFFLINE]\n\n" \ "USR = ; YOUR SSH USER, THIS CAN BE BLANK TO GET ASKED INTERACTIVELY\n"
"WHERE = " "PASS = ; YOUR SSH USERS PW, THIS CAN BE BLANK TO GET ASKED INTERACTIVELY\n"
"PTH = ; THE LOCAL SERVER PATH WHERE TO PUT THE SCREENSHOT\n"
"WHERE = ; THIS SHOULD BE THE FULL ONLINE URL\n"
"\n"
"# PROVIDE NEXTCLOUD INFO BELOW\n"
"[NEXTCLOUD]\n"
"URL = ; URL EITHER IS AN IP OR A FQDN OF A NEXTCLOUD SERVER\n"
"USR = ; YOUR NEXTCLOUD USER, THIS CAN BE BLANK TO GET ASKED INTERACTIVELY\n"
"PASS = ; YOUR NEXTCLOUD USERS PW, THIS CAN BE BLANK TO GET ASKED INTERACTIVELY\n"
"PTH = ; THE NEXTCLOUD FOLDER PATH WHERE TO PUT THE SCREENSHOT\n"
"WHERE = ; THIS SHOULD BE THE FULL ONLINE URL\n"
"\n"
"# IF MODE IS LOCAL YOU MAY CHANGE THE SETTINGS BELOW\n"
"[LOCAL]\n"
"WHERE = ; THIS SHOULD BE A FULL LOCAL PATH\n"
)
f.write(txt) f.write(txt)
config.read_file(open(rootdir + 'settings.ini'))
# General Settings
timeout = int(config.get('MAIN', 'TIMEOUT'))
ssl = config.get('MAIN', 'SSL')
mode = config.get('MAIN', 'MODE') mode = config.get('MAIN', 'MODE')
if mode == "ONLINE": if mode == "SFTP":
url = config.get('ONLINE', 'URL') url = config.get(mode, 'URL')
port = int(config.get('ONLINE', 'PORT')) port = int(config.get(mode, 'PORT'))
timeout = int(config.get('ONLINE', 'TIMEOUT')) usr = config.get(mode, 'USR')
usr = config.get('ONLINE', 'USR') passw = config.get(mode, 'PASS')
passw = config.get('ONLINE', 'PASS') pth = config.get(mode, 'PTH')
pth = config.get('ONLINE', 'PTH') where = config.get(mode, 'WHERE')
where = config.get('ONLINE', 'WHERE')
myini.update( myini.update(
MODE = mode, MODE = mode,
URL = url, URL = url,
@ -165,10 +195,25 @@ def read_ini(rootdir):
USR = usr, USR = usr,
PASS = passw, PASS = passw,
PTH = pth, PTH = pth,
WHERE = where WHERE = sslurl(where, ssl)
) )
elif mode == "OFFLINE": elif mode == "NEXTCLOUD":
where = config.get('OFFLINE', 'WHERE') url = sslurl(config.get(mode, 'URL'), ssl)
usr = config.get(mode, 'USR')
passw = config.get(mode, 'PASS')
pth = config.get(mode, 'PTH')
where = config.get(mode, 'WHERE')
myini.update(
MODE = mode,
URL = url,
TIMEOUT = timeout,
USR = usr,
PASS = passw,
PTH = pth,
WHERE = sslurl(where, ssl)
)
elif mode == "LOCAL":
where = config.get('LOCAL', 'WHERE')
myini.update( myini.update(
MODE = mode, MODE = mode,
WHERE = where WHERE = where
@ -228,17 +273,19 @@ def do_screen(start, end):
im = getRectAsImage(frame) im = getRectAsImage(frame)
send_to_clipboard(im) send_to_clipboard(im)
timestamp = strftime("%Y-%m-%d_%H.%M.%S") timestamp = strftime("%Y-%m-%d_%H-%M-%S")
tempdir = gettempdir()+"\\Screens" tempdir = gettempdir()+"\\Screens"
# print("DEBUG:",tempdir) # print("DEBUG:",tempdir)
if not os.path.exists(tempdir): if not os.path.exists(tempdir):
os.makedirs(tempdir) os.makedirs(tempdir)
tempsave = '{0}\\{1}.png'.format(tempdir, 'Screen_'+timestamp) tempsave = '{0}\\{1}.png'.format(tempdir, timestamp)
im.save(tempsave) im.save(tempsave)
if settings['MODE'] == "ONLINE": if settings['MODE'] == "SFTP":
upload_to_url(tempsave) upload_to_url_sftp(tempsave)
elif settings['MODE'] == "NEXTCLOUD":
upload_to_url_nextcloud(tempsave)
else: else:
save_to_local(tempsave) save_to_local(tempsave)
@ -263,7 +310,7 @@ def send_to_clipboard(im=None):
# https://stackoverflow.com/questions/432385/sftp-in-python-platform-independent # https://stackoverflow.com/questions/432385/sftp-in-python-platform-independent
def upload_to_url(tempsave): def upload_to_url_sftp(tempsave):
# SFTP INFO # SFTP INFO
url = settings['URL'] url = settings['URL']
@ -280,13 +327,13 @@ def upload_to_url(tempsave):
s.close() s.close()
except Exception as e: except Exception as e:
print("ERROR: Connection failed. |||", e) print("ERROR: Connection failed. |||", e)
print("\nFalling back to local save...") print("\n --> Falling back to local mode")
save_to_local(tempsave, fallback=1) save_to_local(tempsave, fallback=1)
return return
# If not provided ask for Username & Password # If not provided ask for Username & Password
if not usr: if not usr:
usr = input("Please provide your Username: ") usr = input("Please provide a username: ")
if not passw: if not passw:
passw = getpass("Please provide the password for {0}: ".format(usr)) passw = getpass("Please provide the password for {0}: ".format(usr))
@ -296,7 +343,7 @@ def upload_to_url(tempsave):
transport.connect(username=usr, password=passw) transport.connect(username=usr, password=passw)
except Exception as e: except Exception as e:
print("ERROR: SSH2 negotiation or authentication failed. |||", e) print("ERROR: SSH2 negotiation or authentication failed. |||", e)
print("\nFalling back to local save...") print("\n--> Falling back to local mode")
save_to_local(tempsave, fallback=1) save_to_local(tempsave, fallback=1)
return return
@ -310,6 +357,48 @@ def upload_to_url(tempsave):
open_url(where) open_url(where)
def upload_to_url_nextcloud(tempsave):
# NEXTCLOUD INFO
url = settings['URL']
timeout = settings['TIMEOUT']
usr = settings['USR']
passw = settings['PASS']
pth = settings['PTH'] + os.path.basename(tempsave)
where = settings['WHERE'] + os.path.basename(tempsave)
# Test Connection first or go into fallback
r = head(url)
httpc = str(r.status_code)[0]
if httpc == "4" or httpc == "5":
print("ERROR: HTTP Statuscode for URL [{0}] is [{1}]".format(url, r.status_code))
print("\n--> Falling back to local mode")
save_to_local(tempsave, fallback=1)
return
# If not provided ask for Username & Password
if not usr:
usr = input("Please provide a username: ")
if not passw:
passw = getpass("Please provide the password for {0}: ".format(usr))
try:
nxt = owncloud.Client(url)
nxt.login(usr, passw)
except Exception as e:
print("ERROR: ", e)
print("\n--> Falling back to local mode")
save_to_local(tempsave, fallback=1)
return
print("Starting to Upload...")
nxt.put_file(pth, tempsave)
print("Screen was Uploaded: URL: " + where)
open_url(where)
def save_to_local(tempsave, fallback=None): def save_to_local(tempsave, fallback=None):
if not fallback: if not fallback:
@ -317,14 +406,14 @@ def save_to_local(tempsave, fallback=None):
else: else:
print(" -> Did fallback!") print(" -> Did fallback!")
config = ConfigParser() config = ConfigParser()
config.read_file(open(root+'_settings.ini')) config.read_file(open(root+'settings.ini'))
where = config.get('OFFLINE', 'WHERE') where = config.get('LOCAL', 'WHERE')
if not where: if not where:
print("No local Screens folder provided, creating one...") print("No local Screens folder provided, creating one...")
where = os.path.dirname(os.path.abspath(__file__))+"\\Screens" where = os.path.dirname(os.path.abspath(__file__))+"\\Screens"
print("OFFLINE MODE: Screenshot Folder:", where) print("LOCAL MODE: Screenshot Folder:", where)
if not os.path.exists(where): if not os.path.exists(where):
os.makedirs(where) os.makedirs(where)
@ -333,6 +422,7 @@ def save_to_local(tempsave, fallback=None):
dst = where + "\\" + os.path.basename(tempsave) dst = where + "\\" + os.path.basename(tempsave)
# print("Source:",src,"\nDestination:",dst) # print("Source:",src,"\nDestination:",dst)
os.rename(src, dst) os.rename(src, dst)
os.startfile(dst)
def open_url(where): def open_url(where):