mirror/vorta
1
0
Fork 0
mirror of https://github.com/borgbase/vorta synced 2025-01-03 13:45:49 +00:00
Code Issues Releases Wiki Activity

Workaround for pyinstaller-keyring issue.

Browse source
This commit is contained in:
Manu 2018-11-01 15:02:56 +08:00
parent ef46cb91d6
commit da4b9dbbed
6 changed files with 138 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/vorta/borg_runner.py
View file

@ -4,7 +4,6 @@
import shutil
import tempfile
import platform
import keyring
from dateutil import parser
from datetime import datetime as dt
from PyQt5 import QtCore
@ -12,7 +11,7 @@
from subprocess import Popen, PIPE
from .models import SourceDirModel, BackupProfileModel, EventLogModel, WifiSettingModel, SnapshotModel, BackupProfileMixin
from .utils import get_current_wifi
from .utils import get_current_wifi, keyring

15
src/vorta/utils.py
View file

@ -8,8 +8,22 @@
from PyQt5.QtWidgets import QApplication
import subprocess
"""Workaround for pyinstaller+keyring issue."""
import keyring
if sys.platform == 'darwin':
from keyring.backends import OS_X
keyring.set_keyring(OS_X.Keyring())
elif sys.platform == 'win32':
from keyring.backends import Windows
keyring.set_keyring(Windows.WinVaultKeyring())
else:
from keyring.backends import SecretService
keyring.set_keyring(SecretService.Keyring())
from .models import WifiSettingModel
def get_private_keys():
"""Find SSH keys in standard folder."""
key_formats = [RSAKey, ECDSAKey, Ed25519Key]
@ -90,4 +104,3 @@ def get_current_wifi():
split_line = line.strip().split(':')
if split_line[0] == 'SSID':
return split_line[1].strip()

238
src/vorta/views/collection_rc.py
View file

@ -9,6 +9,101 @@
from PyQt5 import QtCore
qt_resource_data = b"\
\x00\x00\x01\x89\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x20\x77\x69\x64\x74\x68\
\x3d\x22\x32\x30\x34\x38\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\
\x31\x37\x39\x32\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
\x20\x30\x20\x32\x30\x34\x38\x20\x31\x37\x39\x32\x22\x20\x78\x6d\
\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\
\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x20\x31\
\x35\x33\x36\x68\x37\x36\x38\x76\x2d\x35\x31\x32\x68\x2d\x37\x36\
\x38\x76\x35\x31\x32\x7a\x6d\x31\x30\x32\x34\x2d\x35\x31\x32\x68\
\x35\x31\x32\x76\x2d\x37\x36\x38\x68\x2d\x37\x36\x38\x76\x32\x35\
\x36\x68\x39\x36\x71\x36\x36\x20\x30\x20\x31\x31\x33\x20\x34\x37\
\x74\x34\x37\x20\x31\x31\x33\x76\x33\x35\x32\x7a\x6d\x37\x36\x38\
\x2d\x38\x36\x34\x76\x39\x36\x30\x71\x30\x20\x36\x36\x2d\x34\x37\
\x20\x31\x31\x33\x74\x2d\x31\x31\x33\x20\x34\x37\x68\x2d\x36\x30\
\x38\x76\x33\x35\x32\x71\x30\x20\x36\x36\x2d\x34\x37\x20\x31\x31\
\x33\x74\x2d\x31\x31\x33\x20\x34\x37\x68\x2d\x39\x36\x30\x71\x2d\
\x36\x36\x20\x30\x2d\x31\x31\x33\x2d\x34\x37\x74\x2d\x34\x37\x2d\
\x31\x31\x33\x76\x2d\x39\x36\x30\x71\x30\x2d\x36\x36\x20\x34\x37\
\x2d\x31\x31\x33\x74\x31\x31\x33\x2d\x34\x37\x68\x36\x30\x38\x76\
\x2d\x33\x35\x32\x71\x30\x2d\x36\x36\x20\x34\x37\x2d\x31\x31\x33\
\x74\x31\x31\x33\x2d\x34\x37\x68\x39\x36\x30\x71\x36\x36\x20\x30\
\x20\x31\x31\x33\x20\x34\x37\x74\x34\x37\x20\x31\x31\x33\x7a\x22\
\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
\x00\x00\x01\xfb\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x20\x77\x69\x64\x74\x68\
\x3d\x22\x31\x37\x39\x32\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\
\x31\x37\x39\x32\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
\x20\x30\x20\x31\x37\x39\x32\x20\x31\x37\x39\x32\x22\x20\x78\x6d\
\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\
\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x32\x38\x20\x31\
\x34\x30\x38\x68\x31\x30\x32\x34\x76\x2d\x31\x32\x38\x68\x2d\x31\
\x30\x32\x34\x76\x31\x32\x38\x7a\x6d\x30\x2d\x35\x31\x32\x68\x31\
\x30\x32\x34\x76\x2d\x31\x32\x38\x68\x2d\x31\x30\x32\x34\x76\x31\
\x32\x38\x7a\x6d\x31\x35\x36\x38\x20\x34\x34\x38\x71\x30\x2d\x34\
\x30\x2d\x32\x38\x2d\x36\x38\x74\x2d\x36\x38\x2d\x32\x38\x2d\x36\
\x38\x20\x32\x38\x2d\x32\x38\x20\x36\x38\x20\x32\x38\x20\x36\x38\
\x20\x36\x38\x20\x32\x38\x20\x36\x38\x2d\x32\x38\x20\x32\x38\x2d\
\x36\x38\x7a\x6d\x2d\x31\x35\x36\x38\x2d\x39\x36\x30\x68\x31\x30\
\x32\x34\x76\x2d\x31\x32\x38\x68\x2d\x31\x30\x32\x34\x76\x31\x32\
\x38\x7a\x6d\x31\x35\x36\x38\x20\x34\x34\x38\x71\x30\x2d\x34\x30\
\x2d\x32\x38\x2d\x36\x38\x74\x2d\x36\x38\x2d\x32\x38\x2d\x36\x38\
\x20\x32\x38\x2d\x32\x38\x20\x36\x38\x20\x32\x38\x20\x36\x38\x20\
\x36\x38\x20\x32\x38\x20\x36\x38\x2d\x32\x38\x20\x32\x38\x2d\x36\
\x38\x7a\x6d\x30\x2d\x35\x31\x32\x71\x30\x2d\x34\x30\x2d\x32\x38\
\x2d\x36\x38\x74\x2d\x36\x38\x2d\x32\x38\x2d\x36\x38\x20\x32\x38\
\x2d\x32\x38\x20\x36\x38\x20\x32\x38\x20\x36\x38\x20\x36\x38\x20\
\x32\x38\x20\x36\x38\x2d\x32\x38\x20\x32\x38\x2d\x36\x38\x7a\x6d\
\x39\x36\x20\x38\x33\x32\x76\x33\x38\x34\x68\x2d\x31\x37\x39\x32\
\x76\x2d\x33\x38\x34\x68\x31\x37\x39\x32\x7a\x6d\x30\x2d\x35\x31\
\x32\x76\x33\x38\x34\x68\x2d\x31\x37\x39\x32\x76\x2d\x33\x38\x34\
\x68\x31\x37\x39\x32\x7a\x6d\x30\x2d\x35\x31\x32\x76\x33\x38\x34\
\x68\x2d\x31\x37\x39\x32\x76\x2d\x33\x38\x34\x68\x31\x37\x39\x32\
\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
\x00\x00\x01\xfb\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x20\x77\x69\x64\x74\x68\
\x3d\x22\x31\x37\x39\x32\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\
\x31\x37\x39\x32\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
\x20\x30\x20\x31\x37\x39\x32\x20\x31\x37\x39\x32\x22\x20\x78\x6d\
\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\
\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x30\x32\x34\x20\
\x35\x34\x34\x76\x34\x34\x38\x71\x30\x20\x31\x34\x2d\x39\x20\x32\
\x33\x74\x2d\x32\x33\x20\x39\x68\x2d\x33\x32\x30\x71\x2d\x31\x34\
\x20\x30\x2d\x32\x33\x2d\x39\x74\x2d\x39\x2d\x32\x33\x76\x2d\x36\
\x34\x71\x30\x2d\x31\x34\x20\x39\x2d\x32\x33\x74\x32\x33\x2d\x39\
\x68\x32\x32\x34\x76\x2d\x33\x35\x32\x71\x30\x2d\x31\x34\x20\x39\
\x2d\x32\x33\x74\x32\x33\x2d\x39\x68\x36\x34\x71\x31\x34\x20\x30\
\x20\x32\x33\x20\x39\x74\x39\x20\x32\x33\x7a\x6d\x34\x31\x36\x20\
\x33\x35\x32\x71\x30\x2d\x31\x34\x38\x2d\x37\x33\x2d\x32\x37\x33\
\x74\x2d\x31\x39\x38\x2d\x31\x39\x38\x2d\x32\x37\x33\x2d\x37\x33\
\x2d\x32\x37\x33\x20\x37\x33\x2d\x31\x39\x38\x20\x31\x39\x38\x2d\
\x37\x33\x20\x32\x37\x33\x20\x37\x33\x20\x32\x37\x33\x20\x31\x39\
\x38\x20\x31\x39\x38\x20\x32\x37\x33\x20\x37\x33\x20\x32\x37\x33\
\x2d\x37\x33\x20\x31\x39\x38\x2d\x31\x39\x38\x20\x37\x33\x2d\x32\
\x37\x33\x7a\x6d\x32\x32\x34\x20\x30\x71\x30\x20\x32\x30\x39\x2d\
\x31\x30\x33\x20\x33\x38\x35\x2e\x35\x74\x2d\x32\x37\x39\x2e\x35\
\x20\x32\x37\x39\x2e\x35\x2d\x33\x38\x35\x2e\x35\x20\x31\x30\x33\
\x2d\x33\x38\x35\x2e\x35\x2d\x31\x30\x33\x2d\x32\x37\x39\x2e\x35\
\x2d\x32\x37\x39\x2e\x35\x2d\x31\x30\x33\x2d\x33\x38\x35\x2e\x35\
\x20\x31\x30\x33\x2d\x33\x38\x35\x2e\x35\x20\x32\x37\x39\x2e\x35\
\x2d\x32\x37\x39\x2e\x35\x20\x33\x38\x35\x2e\x35\x2d\x31\x30\x33\
\x20\x33\x38\x35\x2e\x35\x20\x31\x30\x33\x20\x32\x37\x39\x2e\x35\
\x20\x32\x37\x39\x2e\x35\x20\x31\x30\x33\x20\x33\x38\x35\x2e\x35\
\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
\x00\x00\x03\x19\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@ -61,40 +156,6 @@
\x31\x30\x20\x31\x30\x20\x32\x33\x20\x30\x20\x31\x38\x2d\x37\x35\
\x2e\x35\x20\x39\x33\x74\x2d\x39\x32\x2e\x35\x20\x37\x35\x7a\x22\
\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
\x00\x00\x01\xfb\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x20\x77\x69\x64\x74\x68\
\x3d\x22\x31\x37\x39\x32\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\
\x31\x37\x39\x32\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
\x20\x30\x20\x31\x37\x39\x32\x20\x31\x37\x39\x32\x22\x20\x78\x6d\
\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\
\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x32\x38\x20\x31\
\x34\x30\x38\x68\x31\x30\x32\x34\x76\x2d\x31\x32\x38\x68\x2d\x31\
\x30\x32\x34\x76\x31\x32\x38\x7a\x6d\x30\x2d\x35\x31\x32\x68\x31\
\x30\x32\x34\x76\x2d\x31\x32\x38\x68\x2d\x31\x30\x32\x34\x76\x31\
\x32\x38\x7a\x6d\x31\x35\x36\x38\x20\x34\x34\x38\x71\x30\x2d\x34\
\x30\x2d\x32\x38\x2d\x36\x38\x74\x2d\x36\x38\x2d\x32\x38\x2d\x36\
\x38\x20\x32\x38\x2d\x32\x38\x20\x36\x38\x20\x32\x38\x20\x36\x38\
\x20\x36\x38\x20\x32\x38\x20\x36\x38\x2d\x32\x38\x20\x32\x38\x2d\
\x36\x38\x7a\x6d\x2d\x31\x35\x36\x38\x2d\x39\x36\x30\x68\x31\x30\
\x32\x34\x76\x2d\x31\x32\x38\x68\x2d\x31\x30\x32\x34\x76\x31\x32\
\x38\x7a\x6d\x31\x35\x36\x38\x20\x34\x34\x38\x71\x30\x2d\x34\x30\
\x2d\x32\x38\x2d\x36\x38\x74\x2d\x36\x38\x2d\x32\x38\x2d\x36\x38\
\x20\x32\x38\x2d\x32\x38\x20\x36\x38\x20\x32\x38\x20\x36\x38\x20\
\x36\x38\x20\x32\x38\x20\x36\x38\x2d\x32\x38\x20\x32\x38\x2d\x36\
\x38\x7a\x6d\x30\x2d\x35\x31\x32\x71\x30\x2d\x34\x30\x2d\x32\x38\
\x2d\x36\x38\x74\x2d\x36\x38\x2d\x32\x38\x2d\x36\x38\x20\x32\x38\
\x2d\x32\x38\x20\x36\x38\x20\x32\x38\x20\x36\x38\x20\x36\x38\x20\
\x32\x38\x20\x36\x38\x2d\x32\x38\x20\x32\x38\x2d\x36\x38\x7a\x6d\
\x39\x36\x20\x38\x33\x32\x76\x33\x38\x34\x68\x2d\x31\x37\x39\x32\
\x76\x2d\x33\x38\x34\x68\x31\x37\x39\x32\x7a\x6d\x30\x2d\x35\x31\
\x32\x76\x33\x38\x34\x68\x2d\x31\x37\x39\x32\x76\x2d\x33\x38\x34\
\x68\x31\x37\x39\x32\x7a\x6d\x30\x2d\x35\x31\x32\x76\x33\x38\x34\
\x68\x2d\x31\x37\x39\x32\x76\x2d\x33\x38\x34\x68\x31\x37\x39\x32\
\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
\x00\x00\x02\x12\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
@ -131,67 +192,6 @@
\x39\x68\x31\x36\x36\x34\x71\x32\x36\x20\x30\x20\x34\x35\x20\x31\
\x39\x74\x31\x39\x20\x34\x35\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\
\x3e\
\x00\x00\x01\x89\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x20\x77\x69\x64\x74\x68\
\x3d\x22\x32\x30\x34\x38\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\
\x31\x37\x39\x32\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
\x20\x30\x20\x32\x30\x34\x38\x20\x31\x37\x39\x32\x22\x20\x78\x6d\
\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\
\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x32\x35\x36\x20\x31\
\x35\x33\x36\x68\x37\x36\x38\x76\x2d\x35\x31\x32\x68\x2d\x37\x36\
\x38\x76\x35\x31\x32\x7a\x6d\x31\x30\x32\x34\x2d\x35\x31\x32\x68\
\x35\x31\x32\x76\x2d\x37\x36\x38\x68\x2d\x37\x36\x38\x76\x32\x35\
\x36\x68\x39\x36\x71\x36\x36\x20\x30\x20\x31\x31\x33\x20\x34\x37\
\x74\x34\x37\x20\x31\x31\x33\x76\x33\x35\x32\x7a\x6d\x37\x36\x38\
\x2d\x38\x36\x34\x76\x39\x36\x30\x71\x30\x20\x36\x36\x2d\x34\x37\
\x20\x31\x31\x33\x74\x2d\x31\x31\x33\x20\x34\x37\x68\x2d\x36\x30\
\x38\x76\x33\x35\x32\x71\x30\x20\x36\x36\x2d\x34\x37\x20\x31\x31\
\x33\x74\x2d\x31\x31\x33\x20\x34\x37\x68\x2d\x39\x36\x30\x71\x2d\
\x36\x36\x20\x30\x2d\x31\x31\x33\x2d\x34\x37\x74\x2d\x34\x37\x2d\
\x31\x31\x33\x76\x2d\x39\x36\x30\x71\x30\x2d\x36\x36\x20\x34\x37\
\x2d\x31\x31\x33\x74\x31\x31\x33\x2d\x34\x37\x68\x36\x30\x38\x76\
\x2d\x33\x35\x32\x71\x30\x2d\x36\x36\x20\x34\x37\x2d\x31\x31\x33\
\x74\x31\x31\x33\x2d\x34\x37\x68\x39\x36\x30\x71\x36\x36\x20\x30\
\x20\x31\x31\x33\x20\x34\x37\x74\x34\x37\x20\x31\x31\x33\x7a\x22\
\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
\x00\x00\x01\xfb\
\x3c\
\x3f\x78\x6d\x6c\x20\x76\x65\x72\x73\x69\x6f\x6e\x3d\x22\x31\x2e\
\x30\x22\x20\x65\x6e\x63\x6f\x64\x69\x6e\x67\x3d\x22\x75\x74\x66\
\x2d\x38\x22\x3f\x3e\x0a\x3c\x73\x76\x67\x20\x77\x69\x64\x74\x68\
\x3d\x22\x31\x37\x39\x32\x22\x20\x68\x65\x69\x67\x68\x74\x3d\x22\
\x31\x37\x39\x32\x22\x20\x76\x69\x65\x77\x42\x6f\x78\x3d\x22\x30\
\x20\x30\x20\x31\x37\x39\x32\x20\x31\x37\x39\x32\x22\x20\x78\x6d\
\x6c\x6e\x73\x3d\x22\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\
\x77\x33\x2e\x6f\x72\x67\x2f\x32\x30\x30\x30\x2f\x73\x76\x67\x22\
\x3e\x3c\x70\x61\x74\x68\x20\x64\x3d\x22\x4d\x31\x30\x32\x34\x20\
\x35\x34\x34\x76\x34\x34\x38\x71\x30\x20\x31\x34\x2d\x39\x20\x32\
\x33\x74\x2d\x32\x33\x20\x39\x68\x2d\x33\x32\x30\x71\x2d\x31\x34\
\x20\x30\x2d\x32\x33\x2d\x39\x74\x2d\x39\x2d\x32\x33\x76\x2d\x36\
\x34\x71\x30\x2d\x31\x34\x20\x39\x2d\x32\x33\x74\x32\x33\x2d\x39\
\x68\x32\x32\x34\x76\x2d\x33\x35\x32\x71\x30\x2d\x31\x34\x20\x39\
\x2d\x32\x33\x74\x32\x33\x2d\x39\x68\x36\x34\x71\x31\x34\x20\x30\
\x20\x32\x33\x20\x39\x74\x39\x20\x32\x33\x7a\x6d\x34\x31\x36\x20\
\x33\x35\x32\x71\x30\x2d\x31\x34\x38\x2d\x37\x33\x2d\x32\x37\x33\
\x74\x2d\x31\x39\x38\x2d\x31\x39\x38\x2d\x32\x37\x33\x2d\x37\x33\
\x2d\x32\x37\x33\x20\x37\x33\x2d\x31\x39\x38\x20\x31\x39\x38\x2d\
\x37\x33\x20\x32\x37\x33\x20\x37\x33\x20\x32\x37\x33\x20\x31\x39\
\x38\x20\x31\x39\x38\x20\x32\x37\x33\x20\x37\x33\x20\x32\x37\x33\
\x2d\x37\x33\x20\x31\x39\x38\x2d\x31\x39\x38\x20\x37\x33\x2d\x32\
\x37\x33\x7a\x6d\x32\x32\x34\x20\x30\x71\x30\x20\x32\x30\x39\x2d\
\x31\x30\x33\x20\x33\x38\x35\x2e\x35\x74\x2d\x32\x37\x39\x2e\x35\
\x20\x32\x37\x39\x2e\x35\x2d\x33\x38\x35\x2e\x35\x20\x31\x30\x33\
\x2d\x33\x38\x35\x2e\x35\x2d\x31\x30\x33\x2d\x32\x37\x39\x2e\x35\
\x2d\x32\x37\x39\x2e\x35\x2d\x31\x30\x33\x2d\x33\x38\x35\x2e\x35\
\x20\x31\x30\x33\x2d\x33\x38\x35\x2e\x35\x20\x32\x37\x39\x2e\x35\
\x2d\x32\x37\x39\x2e\x35\x20\x33\x38\x35\x2e\x35\x2d\x31\x30\x33\
\x20\x33\x38\x35\x2e\x35\x20\x31\x30\x33\x20\x32\x37\x39\x2e\x35\
\x20\x32\x37\x39\x2e\x35\x20\x31\x30\x33\x20\x33\x38\x35\x2e\x35\
\x7a\x22\x2f\x3e\x3c\x2f\x73\x76\x67\x3e\
"
qt_resource_name = b"\
@ -199,37 +199,37 @@
\x00\x6f\xa6\x53\
\x00\x69\
\x00\x63\x00\x6f\x00\x6e\x00\x73\
\x00\x08\
\x0f\xcc\x55\x67\
\x00\x77\
\x00\x69\x00\x66\x00\x69\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x0a\
\x0c\xca\x63\xe7\
\x00\x73\
\x00\x65\x00\x72\x00\x76\x00\x65\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x09\
\x0a\x26\xaf\xc7\
\x00\x74\
\x00\x61\x00\x73\x00\x6b\x00\x73\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x12\
\x05\x98\xe2\x07\
\x00\x77\
\x00\x69\x00\x6e\x00\x64\x00\x6f\x00\x77\x00\x2d\x00\x72\x00\x65\x00\x73\x00\x74\x00\x6f\x00\x72\x00\x65\x00\x2e\x00\x73\x00\x76\
\x00\x67\
\x00\x0a\
\x0c\xca\x63\xe7\
\x00\x73\
\x00\x65\x00\x72\x00\x76\x00\x65\x00\x72\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x0b\
\x0f\x16\x31\xe7\
\x00\x63\
\x00\x6c\x00\x6f\x00\x63\x00\x6b\x00\x2d\x00\x6f\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x08\
\x0f\xcc\x55\x67\
\x00\x77\
\x00\x69\x00\x66\x00\x69\x00\x2e\x00\x73\x00\x76\x00\x67\
\x00\x09\
\x0a\x26\xaf\xc7\
\x00\x74\
\x00\x61\x00\x73\x00\x6b\x00\x73\x00\x2e\x00\x73\x00\x76\x00\x67\
"
qt_resource_struct_v1 = b"\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x01\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x05\x00\x00\x00\x02\
\x00\x00\x00\x58\x00\x00\x00\x00\x00\x01\x00\x00\x07\x32\
\x00\x00\x00\x40\x00\x00\x00\x00\x00\x01\x00\x00\x05\x1c\
\x00\x00\x00\x26\x00\x00\x00\x00\x00\x01\x00\x00\x03\x1d\
\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x08\xbf\
\x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
\x00\x00\x00\x86\x00\x00\x00\x00\x00\x01\x00\x00\x08\xa8\
\x00\x00\x00\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x01\x8d\
\x00\x00\x00\x54\x00\x00\x00\x00\x00\x01\x00\x00\x03\x8c\
\x00\x00\x00\x70\x00\x00\x00\x00\x00\x01\x00\x00\x05\x8b\
"
qt_resource_struct_v2 = b"\
@ -237,15 +237,15 @@
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x05\x00\x00\x00\x02\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x58\x00\x00\x00\x00\x00\x01\x00\x00\x07\x32\
\x00\x00\x01\x66\xbf\xa1\xb1\x2c\
\x00\x00\x00\x40\x00\x00\x00\x00\x00\x01\x00\x00\x05\x1c\
\x00\x00\x01\x66\xbf\x9f\xde\x3e\
\x00\x00\x00\x26\x00\x00\x00\x00\x00\x01\x00\x00\x03\x1d\
\x00\x00\x01\x66\xbf\xa1\x0f\xda\
\x00\x00\x00\x82\x00\x00\x00\x00\x00\x01\x00\x00\x08\xbf\
\x00\x00\x01\x66\xbf\x9d\x97\x00\
\x00\x00\x00\x10\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
\x00\x00\x01\x66\xbf\xa1\xb1\x2c\
\x00\x00\x00\x86\x00\x00\x00\x00\x00\x01\x00\x00\x08\xa8\
\x00\x00\x01\x66\xbf\x9f\xde\x3e\
\x00\x00\x00\x3a\x00\x00\x00\x00\x00\x01\x00\x00\x01\x8d\
\x00\x00\x01\x66\xbf\xa1\x0f\xda\
\x00\x00\x00\x54\x00\x00\x00\x00\x00\x01\x00\x00\x03\x8c\
\x00\x00\x01\x66\xbf\x9d\x97\x00\
\x00\x00\x00\x70\x00\x00\x00\x00\x00\x01\x00\x00\x05\x8b\
\x00\x00\x01\x66\xbf\x9f\x19\x44\
"

3
src/vorta/views/repo_tab.py
View file

@ -1,10 +1,9 @@
from dateutil import parser
from PyQt5 import uic, QtCore
import keyring
from ..models import RepoModel, SnapshotModel, BackupProfileMixin
from .repo_add import AddRepoWindow, ExistingRepoWindow
from ..utils import prettyBytes, get_private_keys, get_asset
from ..utils import prettyBytes, get_private_keys, get_asset, keyring
from .ssh_add import SSHAddWindow
uifile = get_asset('UI/repotab.ui')

3
src/vorta/views/snapshots_tab.py
View file

@ -1,9 +1,8 @@
import keyring
from PyQt5 import uic
from PyQt5.QtWidgets import QFileDialog, QTableWidgetItem, QTableView, QHeaderView
from ..borg_runner import BorgThread
from ..utils import get_asset
from ..utils import get_asset, keyring
from ..models import BackupProfileMixin
uifile = get_asset('UI/snapshottab.ui')

4
vorta.spec
View file

@ -11,7 +11,7 @@ a = Analysis(['src/vorta/__main__.py'],
('src/vorta/assets/UI/*', 'assets/UI'),
('src/vorta/assets/icons/*', 'assets/icons'),
],
hiddenimports=[],
hiddenimports=['vorta.views.collection_rc'],
hookspath=[],
runtime_hooks=[],
excludes=[],
@ -46,7 +46,7 @@ app = BUNDLE(exe,
},
)
# Debug package. (inspired from borg)
# Debug package. (inspired by borg-spec)
if False:
coll = COLLECT(exe,
a.binaries,