still WIP
This commit is contained in:
parent
68a15dbfc8
commit
1b9d432af9
@ -7,6 +7,7 @@ pipeline:
|
||||
modules:
|
||||
image: python:3.5
|
||||
commands:
|
||||
- rm -rf modules
|
||||
- mkdir -p .pip3
|
||||
- ./make-modules.sh --cache-dir .pip3
|
||||
package:
|
||||
@ -24,7 +25,3 @@ pipeline:
|
||||
- sha256
|
||||
when:
|
||||
event: tag
|
||||
clean:
|
||||
image: kramos/alpine-zip
|
||||
commands:
|
||||
- rm -rf modules
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,3 +1,4 @@
|
||||
modules
|
||||
.pip3
|
||||
seafile.zip
|
||||
lib
|
||||
|
||||
@ -1,3 +1,5 @@
|
||||
from Crypto.Signature import PKCS1_v1_5
|
||||
from Crypto.Hash import SHA256
|
||||
import bson # , scrypt
|
||||
|
||||
from Crypto.Cipher import AES
|
||||
@ -5,7 +7,13 @@ from Crypto.Util import Counter
|
||||
from Crypto.PublicKey import RSA
|
||||
from Crypto.PublicKey import DSA
|
||||
from salsa20 import Salsa20_keystream
|
||||
import os, struct, time, hashlib, hashlib, random, binascii
|
||||
import os
|
||||
import struct
|
||||
import time
|
||||
import hashlib
|
||||
import hashlib
|
||||
import random
|
||||
import binascii
|
||||
|
||||
|
||||
class EncryptedScreenshot:
|
||||
@ -24,14 +32,16 @@ class EncryptedScreenshot:
|
||||
self.password_encryptor = password_encryptor
|
||||
|
||||
def caesar_encrypted_password(self):
|
||||
caesar_key = reduce(lambda sum,charcode: sum+charcode, map(ord,list(self.id)))
|
||||
caesar_key = reduce(lambda sum, charcode: sum +
|
||||
charcode, map(ord, list(self.id)))
|
||||
caesar_plaintext = map(ord, self.password)
|
||||
caesar_ciphertext = Caesar().encrypt(caesar_plaintext, caesar_key)
|
||||
return ''.join(map(chr, caesar_ciphertext))
|
||||
|
||||
def passphrase(self):
|
||||
# new ScryptParameters(64, 8, 1,32, new Uint8List.fromList(new List<int>()))
|
||||
print("Password units: %s" % (map(ord, self.password.encode("utf-8")),))
|
||||
print("Password units: %s" %
|
||||
(map(ord, self.password.encode("utf-8")),))
|
||||
sha = hashlib.sha256()
|
||||
sha.update(self.password.encode("utf-8"))
|
||||
return sha.digest() # scrypt.hash(self.password.encode("utf-8"), '', 64, 8, 1, 32)
|
||||
@ -41,7 +51,8 @@ class EncryptedScreenshot:
|
||||
self.metadata["hash"] = image_digest
|
||||
unencrypted_metadata = bson.dumps(self.metadata)
|
||||
if len(unencrypted_metadata) % 16 != 0:
|
||||
unencrypted_metadata += b' ' * (16 - len(unencrypted_metadata) % 16)
|
||||
unencrypted_metadata += b' ' * \
|
||||
(16 - len(unencrypted_metadata) % 16)
|
||||
(encryptor, iv) = self.encryptor(len(unencrypted_metadata))
|
||||
encrypted_metadata = b''
|
||||
|
||||
@ -64,10 +75,12 @@ class EncryptedScreenshot:
|
||||
}
|
||||
|
||||
if self.signer is not None:
|
||||
fields["signature"] = self.signer.signature(encrypted_metadata if self.metadata_encryption else bson.dumps(self.metadata))
|
||||
fields["signature"] = self.signer.signature(
|
||||
encrypted_metadata if self.metadata_encryption else bson.dumps(self.metadata))
|
||||
|
||||
if self.password_encryptor is not None:
|
||||
fields["password"] = self.password_encryptor.encrypt_password(self.password)
|
||||
fields["password"] = self.password_encryptor.encrypt_password(
|
||||
self.password)
|
||||
|
||||
return bson.dumps(fields)
|
||||
|
||||
@ -109,8 +122,6 @@ class EncryptedScreenshot:
|
||||
binary += encryptor(chunk)
|
||||
return (digest.digest(), iv + binary)
|
||||
|
||||
from Crypto.Signature import PKCS1_v1_5
|
||||
from Crypto.Hash import SHA256
|
||||
|
||||
class Signer:
|
||||
|
||||
@ -153,6 +164,7 @@ class EncryptedPassword:
|
||||
"password": self.encrypt(password)
|
||||
}
|
||||
|
||||
|
||||
class Caesar:
|
||||
|
||||
def __init__(self, charset=map(ord, list("1234567890ABCDEFGHIJKLMNOPQRSTUWVXYZabcdefghijklmnopqrstuwvxyz"))):
|
||||
@ -182,7 +194,8 @@ if __name__ == "__main__":
|
||||
password_encryptor=EncryptedPassword(RSA.importKey(publicKey.decode("base64")), "PUBLIC"))
|
||||
fixed_id = encrypted.id # "W9u9Zm0u"
|
||||
print(len(encrypted.passphrase()))
|
||||
out = open("/home/marvin/Dokumente/IdeaProjects/EncryptedScreencloud/Frontend/WebApp/web/data/" + fixed_id, 'wb')
|
||||
out = open(
|
||||
"/home/marvin/Dokumente/IdeaProjects/EncryptedScreencloud/Frontend/WebApp/web/data/" + fixed_id, 'wb')
|
||||
assembled = encrypted.assemble("5x5red.png")
|
||||
out.write(assembled)
|
||||
b = bson.loads(assembled)
|
||||
@ -190,11 +203,14 @@ if __name__ == "__main__":
|
||||
print(b)
|
||||
# print(assembled.encode("base64").replace("\n","")
|
||||
print("http://localhost:8080/#%s%s" % (fixed_id, encrypted.password))
|
||||
caesar_key = reduce(lambda sum,charcode: sum+charcode, map(ord,list(fixed_id)))
|
||||
caesar_key = reduce(lambda sum, charcode: sum +
|
||||
charcode, map(ord, list(fixed_id)))
|
||||
caesar_plaintext = map(ord, encrypted.password)
|
||||
caesar_ciphertext = Caesar().encrypt(caesar_plaintext, caesar_key)
|
||||
assert caesar_plaintext == Caesar().decrypt(caesar_ciphertext, caesar_key)
|
||||
print("caesar_key=%s %s -> %s" % (caesar_key,encrypted.password,''.join(map(chr,caesar_ciphertext))))
|
||||
print("http://localhost:8080/#%s%sC" % (fixed_id, encrypted.caesar_encrypted_password()))
|
||||
print("caesar_key=%s %s -> %s" %
|
||||
(caesar_key, encrypted.password, ''.join(map(chr, caesar_ciphertext))))
|
||||
print("http://localhost:8080/#%s%sC" %
|
||||
(fixed_id, encrypted.caesar_encrypted_password()))
|
||||
print("http://localhost:8080/#%s" % (fixed_id, ))
|
||||
out.close()
|
||||
|
||||
@ -2,6 +2,7 @@ import hashlib
|
||||
|
||||
import binascii
|
||||
|
||||
|
||||
class HashDerivedKey:
|
||||
|
||||
@staticmethod
|
||||
@ -13,13 +14,15 @@ class HashDerivedKey:
|
||||
assert isinstance(b, bytes)
|
||||
return b
|
||||
ensure_bytes(master)
|
||||
|
||||
def derive(seed):
|
||||
ensure_bytes(seed)
|
||||
sha = hashlib.sha256()
|
||||
sha.update(master)
|
||||
sha.update(seed)
|
||||
return sha.digest()
|
||||
hex = lambda b: binascii.hexlify(b).decode("utf-8")
|
||||
|
||||
def hex(b): return binascii.hexlify(b).decode("utf-8")
|
||||
self.master = master
|
||||
self.master_hex = lambda: hex(master)
|
||||
self.derive = derive
|
||||
|
||||
@ -2,29 +2,49 @@ import time
|
||||
|
||||
from encryptedscreenshot import EncryptedScreenshot, Signer
|
||||
from hashderive import HashDerivedKey
|
||||
import getpass, os, sys
|
||||
import getpass
|
||||
import os
|
||||
import sys
|
||||
from PythonQt.QtGui import QInputDialog
|
||||
from PythonQt.QtCore import QSettings
|
||||
from seafapi import *
|
||||
|
||||
|
||||
class Processor:
|
||||
|
||||
def name(self):
|
||||
pass
|
||||
|
||||
def configure(self, parent):
|
||||
pass
|
||||
|
||||
def is_configured(self):
|
||||
return True
|
||||
|
||||
def upload(self,file):
|
||||
def load_settings(self, settings):
|
||||
pass
|
||||
|
||||
def save_settings(self, settings):
|
||||
pass
|
||||
|
||||
def upload(self, file, name):
|
||||
pass
|
||||
|
||||
|
||||
class DummyProcessor(Processor):
|
||||
|
||||
def name(self):
|
||||
return None
|
||||
|
||||
def is_configured(self):
|
||||
return False
|
||||
|
||||
|
||||
class DefaultProcessor(Processor):
|
||||
|
||||
def name(self):
|
||||
return "default"
|
||||
|
||||
def __init__(self, seaf_lib, lib_path):
|
||||
self.seaf_lib = seaf_lib
|
||||
self.lib_path = lib_path
|
||||
@ -32,8 +52,12 @@ class DefaultProcessor(Processor):
|
||||
def upload(self, file, name):
|
||||
return self.seaf_lib.upload(file, name, self.lib_path).share()
|
||||
|
||||
|
||||
class EncryptedProcessor(Processor):
|
||||
|
||||
def name(self):
|
||||
return "enc"
|
||||
|
||||
def __init__(self, seaf_lib, lib_path):
|
||||
self.seaf_lib = seaf_lib
|
||||
self.lib_path = lib_path
|
||||
@ -41,22 +65,18 @@ class EncryptedProcessor(Processor):
|
||||
self.derived_key = HashDerivedKey(os.urandom(32))
|
||||
self.load_settings()
|
||||
|
||||
def load_settings(self):
|
||||
settings = QSettings()
|
||||
settings.beginGroup("uploaders")
|
||||
settings.beginGroup("seafile")
|
||||
def load_settings(self, settings=QSettings()):
|
||||
self.host = settings.value("encscreen-url", None)
|
||||
if settings.value("encscreen-derived-key", None):
|
||||
self.derived_key = HashDerivedKey.from_hex(settings.value("encscreen-derived-key", None))
|
||||
self.derived_key = HashDerivedKey.from_hex(
|
||||
settings.value("encscreen-derived-key", None))
|
||||
settings.endGroup()
|
||||
settings.endGroup()
|
||||
|
||||
def save_settings(self):
|
||||
settings = QSettings()
|
||||
settings.beginGroup("uploaders")
|
||||
settings.beginGroup("seafile")
|
||||
def save_settings(self, settings=QSettings()):
|
||||
settings.setValue("encscreen-url", self.host)
|
||||
if self.derived_key: settings.setValue(self.derived_key.master_hex())
|
||||
if self.derived_key:
|
||||
settings.setValue(self.derived_key.master_hex())
|
||||
settings.endGroup()
|
||||
settings.endGroup()
|
||||
|
||||
@ -64,8 +84,10 @@ class EncryptedProcessor(Processor):
|
||||
return self.host is not None and self.host != ""
|
||||
|
||||
def configure(self, parent):
|
||||
self.host = QInputDialog.getText(parent, 'Encscreen Server Setup', 'Enter server url (ex. https://servertld/s#%id%key):', text=(self.host or "https://screens.shimun.net/s#%id%key"))
|
||||
master = QInputDialog.getText(parent, 'Encscreen Master Key Setup', 'Enter master key (hex encoded):', text=(self.derived_key.master_hex() if self.derived_key else "<random>"))
|
||||
self.host = QInputDialog.getText(parent, 'Encscreen Server Setup', 'Enter server url (ex. https://servertld/s#%id%key):',
|
||||
text=(self.host or "https://screens.shimun.net/s#%id%key"))
|
||||
master = QInputDialog.getText(parent, 'Encscreen Master Key Setup', 'Enter master key (hex encoded):', text=(
|
||||
self.derived_key.master_hex() if self.derived_key else "<random>"))
|
||||
try:
|
||||
self.derived_key = HashDerivedKey.from_hex(master)
|
||||
except:
|
||||
@ -89,7 +111,8 @@ class EncryptedProcessor(Processor):
|
||||
tmpHandle = open(file + "c", 'wb')
|
||||
tmpHandle.write(enrypted.assemble(file))
|
||||
tmpHandle.close()
|
||||
seaf_file = self.seaf_lib.upload(file + "c",name + ".enc",self.lib_path)
|
||||
seaf_file = self.seaf_lib.upload(
|
||||
file + "c", name + ".enc", self.lib_path)
|
||||
if not seaf_file:
|
||||
return
|
||||
seaf_link = seaf_file.share()
|
||||
@ -98,5 +121,3 @@ class EncryptedProcessor(Processor):
|
||||
return self.host.replace('%id', id).replace('%key', "%s" % enrypted.password)
|
||||
else:
|
||||
return False
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
import time, os
|
||||
import time
|
||||
import os
|
||||
import requests
|
||||
|
||||
|
||||
class SeafileClient:
|
||||
|
||||
def __init__(self, server, username, password=None, token=None):
|
||||
@ -8,7 +10,8 @@ class SeafileClient:
|
||||
self.token = token
|
||||
self.session = requests.Session()
|
||||
if token:
|
||||
self.session.headers.update({'Authorization': "Token %s" % self.token.token})
|
||||
self.session.headers.update(
|
||||
{'Authorization': "Token %s" % self.token.token})
|
||||
self.login = (username, password)
|
||||
|
||||
def api_endpoint(self):
|
||||
@ -20,11 +23,11 @@ class SeafileClient:
|
||||
except:
|
||||
return False
|
||||
|
||||
|
||||
def obtain_token(self):
|
||||
user, passw = self.login
|
||||
try:
|
||||
req=requests.post("%s/auth-token/" % self.api_endpoint(), data = {'username': user, 'password': passw })
|
||||
req = requests.post("%s/auth-token/" % self.api_endpoint(),
|
||||
data={'username': user, 'password': passw})
|
||||
json = req.json()
|
||||
if "non_field_errors" in json:
|
||||
print(json["non_field_errors"])
|
||||
@ -36,19 +39,24 @@ class SeafileClient:
|
||||
def authorize(self):
|
||||
self.token = self.obtain_token()
|
||||
if self.token:
|
||||
self.session.headers.update({'Authorization': "Token %s" % self.token.token})
|
||||
self.session.headers.update(
|
||||
{'Authorization': "Token %s" % self.token.token})
|
||||
return self.token != False
|
||||
|
||||
# curl -H 'Authorization: Token 24fd3c026886e3121b2ca630805ed425c272cb96' -H 'Accept: application/json; indent=4' https://cloud.seafile.com/api2/repos/
|
||||
def libraries(self):
|
||||
resp=self.session.get("%s/repos/" % self.api_endpoint(), headers = {'Authorization': "Token %s" % self.token.token, 'Accept': 'application/json; indent=4' })
|
||||
if not resp.status_code == 200: return
|
||||
resp = self.session.get("%s/repos/" % self.api_endpoint(), headers={
|
||||
'Authorization': "Token %s" % self.token.token, 'Accept': 'application/json; indent=4'})
|
||||
if not resp.status_code == 200:
|
||||
return
|
||||
libraries = []
|
||||
for lib in resp.json():
|
||||
if not lib['encrypted']:
|
||||
libraries.append(SeafileLibrary(self,lib['id'],lib['name'],lib['owner']))
|
||||
libraries.append(SeafileLibrary(
|
||||
self, lib['id'], lib['name'], lib['owner']))
|
||||
return libraries
|
||||
|
||||
|
||||
class SeafileLibrary:
|
||||
|
||||
def __init__(self, client, id, name, owner):
|
||||
@ -65,13 +73,16 @@ class SeafileLibrary:
|
||||
def obtain_link():
|
||||
# curl -H "Authorization: Token f2210dacd9c6ccb8133606d94ff8e61d99b477fd" https://cloud.seafile.com/api2/repos/99b758e6-91ab-4265-b705-925367374cf0/upload-link/
|
||||
print("%s/upload-link" % self.api_endpoint())
|
||||
quoted = self.session.get("%s/upload-link" % self.api_endpoint(), headers = {'Authorization': "Token %s" % self.client.token.token,}).text
|
||||
quoted = self.session.get("%s/upload-link" % self.api_endpoint(), headers={
|
||||
'Authorization': "Token %s" % self.client.token.token, }).text
|
||||
return quoted[1:-1]
|
||||
|
||||
# curl -H "Authorization: Token f2210dacd9c6ccb8133606d94ff8e61d99b477fd" -F file=@test.txt -F filename=test.txt -F parent_dir=/ http://cloud.seafile.com:8082/upload-api/73c5d117-3bcf-48a0-aa2a-3f48d5274ae3
|
||||
resp = self.session.post(link or obtain_link(),
|
||||
files={'file': (file_name,open(file, 'rb')), 'parent_dir': directory, 'target_file': "%s/%s" % (directory,file_name)},
|
||||
headers = {'Authorization': "Token %s" % self.client.token.token,}
|
||||
files={'file': (file_name, open(
|
||||
file, 'rb')), 'parent_dir': directory, 'target_file': "%s/%s" % (directory, file_name)},
|
||||
headers={
|
||||
'Authorization': "Token %s" % self.client.token.token, }
|
||||
)
|
||||
if resp.status_code == 200:
|
||||
return SeafileFile(self, ("%s/%s" % (directory, file_name)).replace('//', '/').replace('//', '/'), resp.text)
|
||||
@ -79,7 +90,8 @@ class SeafileLibrary:
|
||||
|
||||
# curl -H 'Authorization: Token f2210dacd3606d94ff8e61d99b477fd' -H 'Accept: application/json; charset=utf-8; indent=4' https://cloud.seafile.com/api2/repos/dae8cecc-2359-4d33-aa42-01b7846c4b32/file/detail/?p=/foo.c
|
||||
def file_info(self, path):
|
||||
resp=self.session.get("%s/file/detail/?p=%s" % (self.api_endpoint(),path), headers = {'Authorization': "Token %s" % self.token.token, 'Accept': 'application/json; indent=4' })
|
||||
resp = self.session.get("%s/file/detail/?p=%s" % (self.api_endpoint(), path), headers={
|
||||
'Authorization': "Token %s" % self.token.token, 'Accept': 'application/json; indent=4'})
|
||||
if resp.status_code == 200:
|
||||
json = resp.json()
|
||||
return SeafileFile(self, path, json['id'], json['size'])
|
||||
@ -88,6 +100,7 @@ class SeafileLibrary:
|
||||
def __str__(self):
|
||||
return "%s on %s by %s" % (self.name, self.client.server, self.owner)
|
||||
|
||||
|
||||
class SeafileFile:
|
||||
|
||||
def __init__(self, library, path, id, size=0):
|
||||
@ -100,7 +113,8 @@ class SeafileFile:
|
||||
# curl -v -X PUT -d "p=/foo.md" -H 'Authorization: Token f2210dacd9c6ccb8133606d94ff8e61d99b477fd' -H 'Accept: application/json; indent=4' https://cloud.seafile.com/api2/repos/afc3b694-7d4c-4b8a-86a4-89c9f3261b12/file/shared-link/
|
||||
def share(self):
|
||||
resp = self.session.put("%s/repos/%s/file/shared-link/" % (self.library.client.api_endpoint(), self.library.id),
|
||||
headers = {'Authorization': "Token %s" % self.library.client.token.token, 'Accept': 'application/json; indent=4'},
|
||||
headers={'Authorization': "Token %s" % self.library.client.token.token,
|
||||
'Accept': 'application/json; indent=4'},
|
||||
data={'p': self.path}
|
||||
)
|
||||
return resp.headers.get("location")
|
||||
@ -108,11 +122,13 @@ class SeafileFile:
|
||||
def update(self, file):
|
||||
def obtain_link():
|
||||
# curl -H "Authorization: Token f2210dacd9c6ccb8133606d94ff8e61d99b477fd" https://cloud.seafile.com/api2/repos/99b758e6-91ab-4265-b705-925367374cf0/upload-link/
|
||||
quoted = self.session.get("%s/update-link" % self.library.api_endpoint(), headers = {'Authorization': "Token %s" % self.library.client.token.token,}).text
|
||||
quoted = self.session.get("%s/update-link" % self.library.api_endpoint(), headers={
|
||||
'Authorization': "Token %s" % self.library.client.token.token, }).text
|
||||
return quoted[1:-1]
|
||||
directory, name = os.path.split(self.path)
|
||||
return self.library.upload(file, name, directory, obtain_link())
|
||||
|
||||
|
||||
class SeafileToken:
|
||||
|
||||
def __init__(self, username, token):
|
||||
@ -121,5 +137,3 @@ class SeafileToken:
|
||||
|
||||
def __str__(self):
|
||||
return "%s@%s" % (self.token, self.username)
|
||||
|
||||
|
||||
|
||||
72
imports/settings.py
Normal file
72
imports/settings.py
Normal file
@ -0,0 +1,72 @@
|
||||
from processors import DummyProcessor, DefaultProcessor, EncryptedProcessor
|
||||
from seafapi import *
|
||||
|
||||
|
||||
class SeafScreencloudSettings:
|
||||
|
||||
def __init__(self):
|
||||
self.processor = DummyProcessor()
|
||||
self.library = None # (Id, Name)
|
||||
self.library_path = "/"
|
||||
self.token = None # SefileToken
|
||||
self.upload_scheme = "regular"
|
||||
self.url = None
|
||||
|
||||
def _client(self):
|
||||
if self.token and self.url:
|
||||
client = SeafileClient(
|
||||
self.url, self.token.username, token=self.token)
|
||||
|
||||
def c():
|
||||
return client
|
||||
self.client = c
|
||||
return c()
|
||||
return None
|
||||
|
||||
def load(self, settings):
|
||||
|
||||
self.client = self._client
|
||||
|
||||
self.url = settings.value("seafile-url", None)
|
||||
lib = tuple(settings.value("library", "/").split("/"))
|
||||
(id, name) = lib
|
||||
if len(id) == 0 or self.client() == None:
|
||||
self.library = None
|
||||
else:
|
||||
self.library = SeafileLibrary(self.client(), id, name, name)
|
||||
self.library_path = settings.value("library-path", "/")
|
||||
(user, tkn) = (settings.value("auth-username", None),
|
||||
settings.value("auth-token", None))
|
||||
if user == None or tkn == None:
|
||||
self.token = None
|
||||
else:
|
||||
self.token = SeafileToken(user, tkn)
|
||||
|
||||
processors = {
|
||||
"default": DefaultProcessor,
|
||||
"enc": EncryptedProcessor
|
||||
}
|
||||
|
||||
if settings.value("processor", None) in processors:
|
||||
self.processor = processors[settings.value("processor", None)](
|
||||
self.library, self.library_path)
|
||||
self.processor.load_settings(settings)
|
||||
elif self.library:
|
||||
self.processor = DefaultProcessor(self.library, self.library_path)
|
||||
else:
|
||||
self.processor = DummyProcessor()
|
||||
|
||||
# TODO:
|
||||
self.upload_scheme = "regular"
|
||||
|
||||
def save(self, settings):
|
||||
settings.setValue("seafile-url", self.url)
|
||||
if self.library is not None:
|
||||
settings.setValue("library", "%s/%s" %
|
||||
(self.library.id, self.library.name))
|
||||
settings.setValue("library-path", self.library_path)
|
||||
if self.token != None:
|
||||
settings.setValue("auth-username", self.token.username)
|
||||
settings.setValue("auth-token", self.token.token)
|
||||
settings.setValue("processor", self.processor.name())
|
||||
self.processor.save_settings(settings)
|
||||
128
main.py
128
main.py
@ -6,6 +6,7 @@ from PythonQt.QtUiTools import QUiLoader
|
||||
from multiprocessing import Pool, Process
|
||||
|
||||
from seafapi import *
|
||||
from settings import SeafScreencloudSettings
|
||||
from processors import DummyProcessor, DefaultProcessor, EncryptedProcessor
|
||||
###############################
|
||||
## This is a temporary fix, should be removed when a newer python version is used ##
|
||||
@ -13,25 +14,27 @@ import logging
|
||||
logging.captureWarnings(True)
|
||||
###############################
|
||||
|
||||
|
||||
class SeafileUploader():
|
||||
def __init__(self):
|
||||
self.processor = DummyProcessor()
|
||||
self.seaf_lib = None
|
||||
self.seaf_path = "/"
|
||||
self.set = SeafScreencloudSettings()
|
||||
self.libs = None
|
||||
self.uil = QUiLoader()
|
||||
self.loadSettings()
|
||||
self.pool = Pool(2)
|
||||
self.seaf_client = None
|
||||
|
||||
def showSettingsUI(self, parentWidget):
|
||||
self.parentWidget = parentWidget
|
||||
#self.processor.configure(parentWidget)
|
||||
self.settingsDialog = self.uil.load(QFile(workingDir + "/settings.ui"), parentWidget)
|
||||
self.settingsDialog.group_account.widget_loggedIn.loginButton.connect("clicked()", self.startAuthenticationProcess)
|
||||
# self.set.processor.configure(parentWidget)
|
||||
self.settingsDialog = self.uil.load(
|
||||
QFile(workingDir + "/settings.ui"), parentWidget)
|
||||
self.settingsDialog.group_account.widget_loggedIn.loginButton.connect(
|
||||
"clicked()", self.startAuthenticationProcess)
|
||||
#self.settingsDialog.group_name.input_name.connect("textChanged(QString)", self.nameFormatEdited)
|
||||
self.settingsDialog.group_location.widget_location.pathEdit.connect("textChanged(QString)", self.locationUpdate)
|
||||
self.settingsDialog.group_location.widget_location.libraryEditDrop.connect("currentIndexChanged(QString)", self.locationUpdate)
|
||||
self.settingsDialog.group_location.widget_location.pathEdit.connect(
|
||||
"textChanged(QString)", self.locationUpdate)
|
||||
self.settingsDialog.group_location.widget_location.libraryEditDrop.connect(
|
||||
"currentIndexChanged(QString)", self.locationUpdate)
|
||||
self.settingsDialog.connect("accepted()", self.saveSettings)
|
||||
|
||||
self.loadSettings()
|
||||
@ -43,11 +46,11 @@ class SeafileUploader():
|
||||
drop.clear()
|
||||
drop.setEnabled(False)
|
||||
select = 0
|
||||
if self.seaf_client and self.seaf_client.ping():
|
||||
self.libs = (self.seaf_client or self.seaf_lib.client).libraries()
|
||||
if self.set.client() and self.set.client().ping():
|
||||
self.libs = self.set.client().libraries()
|
||||
i = 0
|
||||
for lib in self.libs:
|
||||
if self.seaf_lib is not None and lib.id == self.seaf_lib.id:
|
||||
if self.set.library is not None and (lib.id == self.set.library.id or lib.name == self.set.library.name):
|
||||
select = i
|
||||
print("set %s" % lib.name)
|
||||
drop.addItem(lib.name)
|
||||
@ -56,16 +59,22 @@ class SeafileUploader():
|
||||
drop.setEnabled(True)
|
||||
|
||||
def updateUi(self):
|
||||
self.settingsDialog.group_account.widget_loggedIn.usernameEdit.setText(self.access_token.username if not (self.access_token is None) else "")
|
||||
self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit.setText(self.seaf_url or "https://seaf.shimun.net")
|
||||
self.settingsDialog.group_account.widget_loggedIn.loginButton.setText("Logout" if self.access_token is not None else "Login")
|
||||
self.settingsDialog.group_account.widget_loggedIn.usernameEdit.setText(
|
||||
self.set.token.username if not (self.set.token is None) else "")
|
||||
self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit.setText(
|
||||
self.set.url or "https://seaf.shimun.net")
|
||||
self.settingsDialog.group_account.widget_loggedIn.loginButton.setText(
|
||||
"Logout" if self.set.token is not None else "Login")
|
||||
#
|
||||
if self.access_token is None and len(self.settingsDialog.group_account.widget_loggedIn.passwordEdit.text) > 0:
|
||||
self.settingsDialog.group_account.widget_loggedIn.passwordEdit.setText("X" * 8)
|
||||
if self.set.token is None and len(self.settingsDialog.group_account.widget_loggedIn.passwordEdit.text) > 0:
|
||||
self.settingsDialog.group_account.widget_loggedIn.passwordEdit.setText(
|
||||
"X" * 8)
|
||||
for elm in [self.settingsDialog.group_account.widget_loggedIn.usernameEdit, self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit, self.settingsDialog.group_account.widget_loggedIn.passwordEdit]:
|
||||
elm.setEnabled(self.access_token is None)
|
||||
self.settingsDialog.group_location.setEnabled(self.access_token is not None)
|
||||
self.settingsDialog.group_location.widget_location.pathEdit.setText(self.lib_path or "/")
|
||||
elm.setEnabled(self.set.token is None)
|
||||
self.settingsDialog.group_location.setEnabled(
|
||||
self.set.token is not None)
|
||||
self.settingsDialog.group_location.widget_location.pathEdit.setText(
|
||||
self.set.library_path or "/")
|
||||
self.settingsDialog.linkCopyCheck.setChecked(self.copyLink)
|
||||
self.populateLibrarySelector()
|
||||
self.settingsDialog.adjustSize()
|
||||
@ -74,53 +83,30 @@ class SeafileUploader():
|
||||
settings = QSettings()
|
||||
settings.beginGroup("uploaders")
|
||||
settings.beginGroup("seafile")
|
||||
self.seaf_url = settings.value("seafile-url", "")
|
||||
(self.lib_id,self.lib_name) = str(settings.value("library", "/")).split("/")
|
||||
self.lib_path = settings.value("library-path", "")
|
||||
self.set.load(settings)
|
||||
self.copyLink = settings.value("copy-link", "true") in ['true', True]
|
||||
if settings.value("auth-token", False) and settings.value("auth-username", False):
|
||||
self.access_token = SeafileToken(settings.value("auth-username", False),settings.value("auth-token", False))
|
||||
else:
|
||||
self.access_token = None
|
||||
self.nameFormat = settings.value("name-format", "Screenshot %Y-%m-%d %H_%M_%S")
|
||||
self.nameFormat = settings.value(
|
||||
"name-format", "Screenshot %Y-%m-%d %H_%M_%S")
|
||||
self.upload_scheme = settings.value("upload-scheme", "regular")
|
||||
settings.endGroup()
|
||||
settings.endGroup()
|
||||
if self.seaf_url and self.access_token:
|
||||
self.seaf_client = SeafileClient(self.seaf_url,self.access_token.username,token=self.access_token)
|
||||
if self.seaf_client.ping():
|
||||
for lib in self.seaf_client.libraries():
|
||||
if lib.id == self.lib_id:
|
||||
self.seaf_lib = lib
|
||||
if self.seaf_lib and self.seaf_path:
|
||||
self.processor = EncryptedProcessor(self.seaf_lib,self.lib_path)#DefaultProcessor(self.seaf_lib,self.lib_path)
|
||||
|
||||
|
||||
def saveSettings(self):
|
||||
settings = QSettings()
|
||||
settings.beginGroup("uploaders")
|
||||
settings.beginGroup("seafile")
|
||||
self.set.save(settings)
|
||||
try:
|
||||
self.copyLink = self.settingsDialog.linkCopyCheck.checked
|
||||
except:
|
||||
pass
|
||||
settings.setValue("copy-link", self.copyLink)
|
||||
if self.access_token is not None:
|
||||
settings.setValue("auth-username", self.access_token.username )
|
||||
settings.setValue("auth-token", self.access_token.token)
|
||||
settings.setValue("seafile-url", self.seaf_url)
|
||||
if self.seaf_lib is not None:
|
||||
settings.setValue("library", "%s/%s" % (self.seaf_lib.id,self.seaf_lib.name))
|
||||
settings.setValue("library-path", self.lib_path)
|
||||
settings.setValue("name-format", self.nameFormat)
|
||||
settings.setValue("upload-scheme", self.upload_scheme)
|
||||
#settings.setValue("name-format", self.settingsDialog.group_name.input_name.text)
|
||||
print(self.seaf_lib, self.lib_path)
|
||||
settings.endGroup()
|
||||
settings.endGroup()
|
||||
|
||||
def isConfigured(self):
|
||||
return self.access_token and self.seaf_url and self.processor.is_configured()
|
||||
return self.set.library and self.set.processor.is_configured()
|
||||
|
||||
def getFilename(self):
|
||||
self.loadSettings()
|
||||
@ -129,11 +115,12 @@ class SeafileUploader():
|
||||
def upload(self, screenshot, name):
|
||||
self.loadSettings()
|
||||
# Make sure we have a up to date token
|
||||
if not self.seaf_lib:
|
||||
if not self.set.library:
|
||||
ScreenCloud.setError("Not configured properly")
|
||||
return False
|
||||
# Save to a temporary file
|
||||
timestamp = time.time()
|
||||
|
||||
def tempfile(name):
|
||||
try:
|
||||
return QDesktopServices.storageLocation(QDesktopServices.TempLocation) + "/" + name
|
||||
@ -145,31 +132,33 @@ class SeafileUploader():
|
||||
screenshot.save(QFile(tmpFilename), ScreenCloud.getScreenshotFormat())
|
||||
# Upload!
|
||||
link = None
|
||||
if True:
|
||||
#try:
|
||||
link = self.processor.upload(tmpFilename,self.getFilename())
|
||||
# if True:
|
||||
try:
|
||||
link = self.set.processor.upload(tmpFilename, self.getFilename())
|
||||
if self.copyLink:
|
||||
ScreenCloud.setUrl(link)
|
||||
#except Exception as e:
|
||||
# ScreenCloud.setError("Failed to upload to seafile. " + e.message)
|
||||
# return False
|
||||
except Exception as e:
|
||||
ScreenCloud.setError("Failed to upload to seafile. Using: %s\n\n%s" % (
|
||||
self.set.processor.name(), e.message))
|
||||
return False
|
||||
return True
|
||||
|
||||
def startAuthenticationProcess(self):
|
||||
self.saveSettings()
|
||||
self.loadSettings()
|
||||
|
||||
if self.access_token is not None:
|
||||
if self.set.token is not None:
|
||||
self.logOut()
|
||||
return
|
||||
|
||||
if self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit.text \
|
||||
and self.settingsDialog.group_account.widget_loggedIn.usernameEdit.text \
|
||||
and self.settingsDialog.group_account.widget_loggedIn.passwordEdit.text:
|
||||
self.seaf_url = self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit.text
|
||||
self.set.url = self.settingsDialog.group_account.widget_loggedIn.serverUrlEdit.text
|
||||
if True:
|
||||
# try:
|
||||
self.login(self.settingsDialog.group_account.widget_loggedIn.usernameEdit.text,self.settingsDialog.group_account.widget_loggedIn.passwordEdit.text)
|
||||
self.login(self.settingsDialog.group_account.widget_loggedIn.usernameEdit.text,
|
||||
self.settingsDialog.group_account.widget_loggedIn.passwordEdit.text)
|
||||
self.saveSettings()
|
||||
self.loadSettings()
|
||||
self.populateLibrarySelector()
|
||||
@ -181,31 +170,32 @@ class SeafileUploader():
|
||||
def locationUpdate(self):
|
||||
drop = self.settingsDialog.group_location.widget_location.libraryEditDrop
|
||||
selected_lib = drop.currentText
|
||||
if not drop.isEnabled(): return #not populated
|
||||
self.lib_path = self.settingsDialog.group_location.widget_location.pathEdit.text
|
||||
print(self.lib_path, selected_lib)
|
||||
if self.libs is None: return
|
||||
if not drop.isEnabled():
|
||||
return # not populated
|
||||
self.set.library_path = self.settingsDialog.group_location.widget_location.pathEdit.text
|
||||
print(self.set.library_path, selected_lib)
|
||||
if self.libs is None:
|
||||
return
|
||||
for lib in self.libs:
|
||||
if lib.name == selected_lib:
|
||||
self.seaf_lib = lib
|
||||
self.set.library = lib
|
||||
print("%s user selected" % selected_lib)
|
||||
|
||||
|
||||
def login(self, user, password):
|
||||
cli = SeafileClient(self.seaf_url,user,password)
|
||||
self.access_token = cli.obtain_token()
|
||||
cli = SeafileClient(self.set.url, user, password)
|
||||
self.set.token = cli.obtain_token()
|
||||
|
||||
def logOut(self):
|
||||
settings = QSettings()
|
||||
settings.beginGroup("uploaders")
|
||||
settings.beginGroup("seafile")
|
||||
settings.remove("auth-token")
|
||||
self.access_token = None
|
||||
self.set.token = None
|
||||
settings.endGroup()
|
||||
settings.endGroup()
|
||||
self.loadSettings()
|
||||
self.updateUi()
|
||||
|
||||
def nameFormatEdited(self, nameFormat):
|
||||
self.settingsDialog.group_name.label_example.setText(ScreenCloud.formatFilename(nameFormat, False))
|
||||
|
||||
self.settingsDialog.group_name.label_example.setText(
|
||||
ScreenCloud.formatFilename(nameFormat, False))
|
||||
|
||||
@ -1,5 +1,4 @@
|
||||
rm -rf modules
|
||||
mkdir modules
|
||||
pip3 install --install-option="--prefix=$PWD" -r requirements.txt
|
||||
mv lib/python3.5/site-packages/* modules/
|
||||
mkdir -p modules
|
||||
pip3 install --install-option="--prefix=$PWD" -r requirements.txt "$@"
|
||||
mv lib/python3.*/site-packages/* modules/
|
||||
cp imports/* -r modules/
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user