remove class Spinner(), not necessary
This commit is contained in:
parent
f8c6ec2621
commit
89a517d166
4 changed files with 57 additions and 251 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -3,3 +3,4 @@
|
|||
__pycache__
|
||||
.vscode
|
||||
.idea
|
||||
.pylintrc
|
||||
1
Pipfile
1
Pipfile
|
|
@ -6,7 +6,6 @@ name = "pypi"
|
|||
[packages]
|
||||
pyqt6 = "*"
|
||||
cryptography = "*"
|
||||
pylint = "*"
|
||||
|
||||
[dev-packages]
|
||||
|
||||
|
|
|
|||
179
Pipfile.lock
generated
179
Pipfile.lock
generated
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"_meta": {
|
||||
"hash": {
|
||||
"sha256": "487ba5622c2c55bc646bf28eaf9249b2e39011db8f7fcc46b164e7c6950284db"
|
||||
"sha256": "fdba581f5444c396272b6f15366550ad5b3e3bf26336dd839c66830a16298e1b"
|
||||
},
|
||||
"pipfile-spec": 6,
|
||||
"requires": {
|
||||
|
|
@ -16,14 +16,6 @@
|
|||
]
|
||||
},
|
||||
"default": {
|
||||
"astroid": {
|
||||
"hashes": [
|
||||
"sha256:0dafbfcf4ebdecd3c8f6d742c9d9c88508229ca823d5c98ab872d964f3321e56",
|
||||
"sha256:27a22f40e45af6d362498647a0940e8ae9c35f71cb572a1b6f8f810122a11918"
|
||||
],
|
||||
"markers": "python_full_version >= '3.7.2'",
|
||||
"version": "==2.12.9"
|
||||
},
|
||||
"cffi": {
|
||||
"hashes": [
|
||||
"sha256:00a9ed42e88df81ffae7a8ab6d9356b371399b91dbdf0c3cb1e84c03a13aceb5",
|
||||
|
|
@ -125,81 +117,6 @@
|
|||
"index": "pypi",
|
||||
"version": "==38.0.1"
|
||||
},
|
||||
"dill": {
|
||||
"hashes": [
|
||||
"sha256:33501d03270bbe410c72639b350e941882a8b0fd55357580fbc873fba0c59302",
|
||||
"sha256:d75e41f3eff1eee599d738e76ba8f4ad98ea229db8b085318aa2b3333a208c86"
|
||||
],
|
||||
"markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'",
|
||||
"version": "==0.3.5.1"
|
||||
},
|
||||
"isort": {
|
||||
"hashes": [
|
||||
"sha256:6f62d78e2f89b4500b080fe3a81690850cd254227f27f75c3a0c491a1f351ba7",
|
||||
"sha256:e8443a5e7a020e9d7f97f1d7d9cd17c88bcb3bc7e218bf9cf5095fe550be2951"
|
||||
],
|
||||
"markers": "python_version < '4.0' and python_full_version >= '3.6.1'",
|
||||
"version": "==5.10.1"
|
||||
},
|
||||
"lazy-object-proxy": {
|
||||
"hashes": [
|
||||
"sha256:043651b6cb706eee4f91854da4a089816a6606c1428fd391573ef8cb642ae4f7",
|
||||
"sha256:07fa44286cda977bd4803b656ffc1c9b7e3bc7dff7d34263446aec8f8c96f88a",
|
||||
"sha256:12f3bb77efe1367b2515f8cb4790a11cffae889148ad33adad07b9b55e0ab22c",
|
||||
"sha256:2052837718516a94940867e16b1bb10edb069ab475c3ad84fd1e1a6dd2c0fcfc",
|
||||
"sha256:2130db8ed69a48a3440103d4a520b89d8a9405f1b06e2cc81640509e8bf6548f",
|
||||
"sha256:39b0e26725c5023757fc1ab2a89ef9d7ab23b84f9251e28f9cc114d5b59c1b09",
|
||||
"sha256:46ff647e76f106bb444b4533bb4153c7370cdf52efc62ccfc1a28bdb3cc95442",
|
||||
"sha256:4dca6244e4121c74cc20542c2ca39e5c4a5027c81d112bfb893cf0790f96f57e",
|
||||
"sha256:553b0f0d8dbf21890dd66edd771f9b1b5f51bd912fa5f26de4449bfc5af5e029",
|
||||
"sha256:677ea950bef409b47e51e733283544ac3d660b709cfce7b187f5ace137960d61",
|
||||
"sha256:6a24357267aa976abab660b1d47a34aaf07259a0c3859a34e536f1ee6e76b5bb",
|
||||
"sha256:6a6e94c7b02641d1311228a102607ecd576f70734dc3d5e22610111aeacba8a0",
|
||||
"sha256:6aff3fe5de0831867092e017cf67e2750c6a1c7d88d84d2481bd84a2e019ec35",
|
||||
"sha256:6ecbb350991d6434e1388bee761ece3260e5228952b1f0c46ffc800eb313ff42",
|
||||
"sha256:7096a5e0c1115ec82641afbdd70451a144558ea5cf564a896294e346eb611be1",
|
||||
"sha256:70ed0c2b380eb6248abdef3cd425fc52f0abd92d2b07ce26359fcbc399f636ad",
|
||||
"sha256:8561da8b3dd22d696244d6d0d5330618c993a215070f473b699e00cf1f3f6443",
|
||||
"sha256:85b232e791f2229a4f55840ed54706110c80c0a210d076eee093f2b2e33e1bfd",
|
||||
"sha256:898322f8d078f2654d275124a8dd19b079080ae977033b713f677afcfc88e2b9",
|
||||
"sha256:8f3953eb575b45480db6568306893f0bd9d8dfeeebd46812aa09ca9579595148",
|
||||
"sha256:91ba172fc5b03978764d1df5144b4ba4ab13290d7bab7a50f12d8117f8630c38",
|
||||
"sha256:9d166602b525bf54ac994cf833c385bfcc341b364e3ee71e3bf5a1336e677b55",
|
||||
"sha256:a57d51ed2997e97f3b8e3500c984db50a554bb5db56c50b5dab1b41339b37e36",
|
||||
"sha256:b9e89b87c707dd769c4ea91f7a31538888aad05c116a59820f28d59b3ebfe25a",
|
||||
"sha256:bb8c5fd1684d60a9902c60ebe276da1f2281a318ca16c1d0a96db28f62e9166b",
|
||||
"sha256:c19814163728941bb871240d45c4c30d33b8a2e85972c44d4e63dd7107faba44",
|
||||
"sha256:c4ce15276a1a14549d7e81c243b887293904ad2d94ad767f42df91e75fd7b5b6",
|
||||
"sha256:c7a683c37a8a24f6428c28c561c80d5f4fd316ddcf0c7cab999b15ab3f5c5c69",
|
||||
"sha256:d609c75b986def706743cdebe5e47553f4a5a1da9c5ff66d76013ef396b5a8a4",
|
||||
"sha256:d66906d5785da8e0be7360912e99c9188b70f52c422f9fc18223347235691a84",
|
||||
"sha256:dd7ed7429dbb6c494aa9bc4e09d94b778a3579be699f9d67da7e6804c422d3de",
|
||||
"sha256:df2631f9d67259dc9620d831384ed7732a198eb434eadf69aea95ad18c587a28",
|
||||
"sha256:e368b7f7eac182a59ff1f81d5f3802161932a41dc1b1cc45c1f757dc876b5d2c",
|
||||
"sha256:e40f2013d96d30217a51eeb1db28c9ac41e9d0ee915ef9d00da639c5b63f01a1",
|
||||
"sha256:f769457a639403073968d118bc70110e7dce294688009f5c24ab78800ae56dc8",
|
||||
"sha256:fccdf7c2c5821a8cbd0a9440a456f5050492f2270bd54e94360cac663398739b",
|
||||
"sha256:fd45683c3caddf83abbb1249b653a266e7069a09f486daa8863fb0e7496a9fdb"
|
||||
],
|
||||
"markers": "python_version >= '3.6'",
|
||||
"version": "==1.7.1"
|
||||
},
|
||||
"mccabe": {
|
||||
"hashes": [
|
||||
"sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325",
|
||||
"sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e"
|
||||
],
|
||||
"markers": "python_version >= '3.6'",
|
||||
"version": "==0.7.0"
|
||||
},
|
||||
"platformdirs": {
|
||||
"hashes": [
|
||||
"sha256:027d8e83a2d7de06bbac4e5ef7e023c02b863d7ea5d079477e722bb41ab25788",
|
||||
"sha256:58c8abb07dcb441e6ee4b11d8df0ac856038f944ab98b7be6b27b2a3c7feef19"
|
||||
],
|
||||
"markers": "python_version >= '3.7'",
|
||||
"version": "==2.5.2"
|
||||
},
|
||||
"pycparser": {
|
||||
"hashes": [
|
||||
"sha256:8ee45429555515e1f6b185e78100aea234072576aa43ab53aefcae078162fca9",
|
||||
|
|
@ -207,14 +124,6 @@
|
|||
],
|
||||
"version": "==2.21"
|
||||
},
|
||||
"pylint": {
|
||||
"hashes": [
|
||||
"sha256:cc3da458ba810c49d330e09013dec7ced5217772dec8f043ccdd34dae648fde8",
|
||||
"sha256:f63404a2547edb5247da263748771ac9a806ed1de4174cda01293c08ddbc2999"
|
||||
],
|
||||
"index": "pypi",
|
||||
"version": "==2.15.2"
|
||||
},
|
||||
"pyqt6": {
|
||||
"hashes": [
|
||||
"sha256:115f809810c236af90352b4df4a9dfc79cbd05b7c0200c05886c8b3035c2847b",
|
||||
|
|
@ -253,92 +162,6 @@
|
|||
],
|
||||
"markers": "python_version >= '3.7'",
|
||||
"version": "==13.4.0"
|
||||
},
|
||||
"tomli": {
|
||||
"hashes": [
|
||||
"sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc",
|
||||
"sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"
|
||||
],
|
||||
"markers": "python_version < '3.11'",
|
||||
"version": "==2.0.1"
|
||||
},
|
||||
"tomlkit": {
|
||||
"hashes": [
|
||||
"sha256:25d4e2e446c453be6360c67ddfb88838cfc42026322770ba13d1fbd403a93a5c",
|
||||
"sha256:3235a9010fae54323e727c3ac06fb720752fe6635b3426e379daec60fbd44a83"
|
||||
],
|
||||
"markers": "python_version >= '3.6' and python_version < '4.0'",
|
||||
"version": "==0.11.4"
|
||||
},
|
||||
"wrapt": {
|
||||
"hashes": [
|
||||
"sha256:00b6d4ea20a906c0ca56d84f93065b398ab74b927a7a3dbd470f6fc503f95dc3",
|
||||
"sha256:01c205616a89d09827986bc4e859bcabd64f5a0662a7fe95e0d359424e0e071b",
|
||||
"sha256:02b41b633c6261feff8ddd8d11c711df6842aba629fdd3da10249a53211a72c4",
|
||||
"sha256:07f7a7d0f388028b2df1d916e94bbb40624c59b48ecc6cbc232546706fac74c2",
|
||||
"sha256:11871514607b15cfeb87c547a49bca19fde402f32e2b1c24a632506c0a756656",
|
||||
"sha256:1b376b3f4896e7930f1f772ac4b064ac12598d1c38d04907e696cc4d794b43d3",
|
||||
"sha256:21ac0156c4b089b330b7666db40feee30a5d52634cc4560e1905d6529a3897ff",
|
||||
"sha256:257fd78c513e0fb5cdbe058c27a0624c9884e735bbd131935fd49e9fe719d310",
|
||||
"sha256:2b39d38039a1fdad98c87279b48bc5dce2c0ca0d73483b12cb72aa9609278e8a",
|
||||
"sha256:2cf71233a0ed05ccdabe209c606fe0bac7379fdcf687f39b944420d2a09fdb57",
|
||||
"sha256:2fe803deacd09a233e4762a1adcea5db5d31e6be577a43352936179d14d90069",
|
||||
"sha256:3232822c7d98d23895ccc443bbdf57c7412c5a65996c30442ebe6ed3df335383",
|
||||
"sha256:34aa51c45f28ba7f12accd624225e2b1e5a3a45206aa191f6f9aac931d9d56fe",
|
||||
"sha256:36f582d0c6bc99d5f39cd3ac2a9062e57f3cf606ade29a0a0d6b323462f4dd87",
|
||||
"sha256:380a85cf89e0e69b7cfbe2ea9f765f004ff419f34194018a6827ac0e3edfed4d",
|
||||
"sha256:40e7bc81c9e2b2734ea4bc1aceb8a8f0ceaac7c5299bc5d69e37c44d9081d43b",
|
||||
"sha256:43ca3bbbe97af00f49efb06e352eae40434ca9d915906f77def219b88e85d907",
|
||||
"sha256:4fcc4649dc762cddacd193e6b55bc02edca674067f5f98166d7713b193932b7f",
|
||||
"sha256:5a0f54ce2c092aaf439813735584b9537cad479575a09892b8352fea5e988dc0",
|
||||
"sha256:5a9a0d155deafd9448baff28c08e150d9b24ff010e899311ddd63c45c2445e28",
|
||||
"sha256:5b02d65b9ccf0ef6c34cba6cf5bf2aab1bb2f49c6090bafeecc9cd81ad4ea1c1",
|
||||
"sha256:60db23fa423575eeb65ea430cee741acb7c26a1365d103f7b0f6ec412b893853",
|
||||
"sha256:642c2e7a804fcf18c222e1060df25fc210b9c58db7c91416fb055897fc27e8cc",
|
||||
"sha256:6a9a25751acb379b466ff6be78a315e2b439d4c94c1e99cb7266d40a537995d3",
|
||||
"sha256:6b1a564e6cb69922c7fe3a678b9f9a3c54e72b469875aa8018f18b4d1dd1adf3",
|
||||
"sha256:6d323e1554b3d22cfc03cd3243b5bb815a51f5249fdcbb86fda4bf62bab9e164",
|
||||
"sha256:6e743de5e9c3d1b7185870f480587b75b1cb604832e380d64f9504a0535912d1",
|
||||
"sha256:709fe01086a55cf79d20f741f39325018f4df051ef39fe921b1ebe780a66184c",
|
||||
"sha256:7b7c050ae976e286906dd3f26009e117eb000fb2cf3533398c5ad9ccc86867b1",
|
||||
"sha256:7d2872609603cb35ca513d7404a94d6d608fc13211563571117046c9d2bcc3d7",
|
||||
"sha256:7ef58fb89674095bfc57c4069e95d7a31cfdc0939e2a579882ac7d55aadfd2a1",
|
||||
"sha256:80bb5c256f1415f747011dc3604b59bc1f91c6e7150bd7db03b19170ee06b320",
|
||||
"sha256:81b19725065dcb43df02b37e03278c011a09e49757287dca60c5aecdd5a0b8ed",
|
||||
"sha256:833b58d5d0b7e5b9832869f039203389ac7cbf01765639c7309fd50ef619e0b1",
|
||||
"sha256:88bd7b6bd70a5b6803c1abf6bca012f7ed963e58c68d76ee20b9d751c74a3248",
|
||||
"sha256:8ad85f7f4e20964db4daadcab70b47ab05c7c1cf2a7c1e51087bfaa83831854c",
|
||||
"sha256:8c0ce1e99116d5ab21355d8ebe53d9460366704ea38ae4d9f6933188f327b456",
|
||||
"sha256:8d649d616e5c6a678b26d15ece345354f7c2286acd6db868e65fcc5ff7c24a77",
|
||||
"sha256:903500616422a40a98a5a3c4ff4ed9d0066f3b4c951fa286018ecdf0750194ef",
|
||||
"sha256:9736af4641846491aedb3c3f56b9bc5568d92b0692303b5a305301a95dfd38b1",
|
||||
"sha256:988635d122aaf2bdcef9e795435662bcd65b02f4f4c1ae37fbee7401c440b3a7",
|
||||
"sha256:9cca3c2cdadb362116235fdbd411735de4328c61425b0aa9f872fd76d02c4e86",
|
||||
"sha256:9e0fd32e0148dd5dea6af5fee42beb949098564cc23211a88d799e434255a1f4",
|
||||
"sha256:9f3e6f9e05148ff90002b884fbc2a86bd303ae847e472f44ecc06c2cd2fcdb2d",
|
||||
"sha256:a85d2b46be66a71bedde836d9e41859879cc54a2a04fad1191eb50c2066f6e9d",
|
||||
"sha256:a9a52172be0b5aae932bef82a79ec0a0ce87288c7d132946d645eba03f0ad8a8",
|
||||
"sha256:aa31fdcc33fef9eb2552cbcbfee7773d5a6792c137b359e82879c101e98584c5",
|
||||
"sha256:b014c23646a467558be7da3d6b9fa409b2c567d2110599b7cf9a0c5992b3b471",
|
||||
"sha256:b21bb4c09ffabfa0e85e3a6b623e19b80e7acd709b9f91452b8297ace2a8ab00",
|
||||
"sha256:b5901a312f4d14c59918c221323068fad0540e34324925c8475263841dbdfe68",
|
||||
"sha256:b9b7a708dd92306328117d8c4b62e2194d00c365f18eff11a9b53c6f923b01e3",
|
||||
"sha256:d1967f46ea8f2db647c786e78d8cc7e4313dbd1b0aca360592d8027b8508e24d",
|
||||
"sha256:d52a25136894c63de15a35bc0bdc5adb4b0e173b9c0d07a2be9d3ca64a332735",
|
||||
"sha256:d77c85fedff92cf788face9bfa3ebaa364448ebb1d765302e9af11bf449ca36d",
|
||||
"sha256:d79d7d5dc8a32b7093e81e97dad755127ff77bcc899e845f41bf71747af0c569",
|
||||
"sha256:dbcda74c67263139358f4d188ae5faae95c30929281bc6866d00573783c422b7",
|
||||
"sha256:ddaea91abf8b0d13443f6dac52e89051a5063c7d014710dcb4d4abb2ff811a59",
|
||||
"sha256:dee0ce50c6a2dd9056c20db781e9c1cfd33e77d2d569f5d1d9321c641bb903d5",
|
||||
"sha256:dee60e1de1898bde3b238f18340eec6148986da0455d8ba7848d50470a7a32fb",
|
||||
"sha256:e2f83e18fe2f4c9e7db597e988f72712c0c3676d337d8b101f6758107c42425b",
|
||||
"sha256:e3fb1677c720409d5f671e39bac6c9e0e422584e5f518bfd50aa4cbbea02433f",
|
||||
"sha256:ee2b1b1769f6707a8a445162ea16dddf74285c3964f605877a20e38545c3c462",
|
||||
"sha256:ee6acae74a2b91865910eef5e7de37dc6895ad96fa23603d1d27ea69df545015",
|
||||
"sha256:ef3f72c9666bba2bab70d2a8b79f2c6d2c1a42a7f7e2b0ec83bb2f9e383950af"
|
||||
],
|
||||
"markers": "python_version < '3.11'",
|
||||
"version": "==1.14.1"
|
||||
}
|
||||
},
|
||||
"develop": {}
|
||||
|
|
|
|||
127
src/restic_ui.py
127
src/restic_ui.py
|
|
@ -123,23 +123,6 @@ except OSError as e:
|
|||
sys.exit("Please install restic, **sudo apt install restic**")
|
||||
|
||||
|
||||
#####################
|
||||
# Class Spinner
|
||||
#####################
|
||||
|
||||
|
||||
class Spinner():
|
||||
""" Class for waitingspinnerwidget """
|
||||
|
||||
def start(self):
|
||||
""" Start the spinner """
|
||||
spinner.start()
|
||||
|
||||
def stop(self):
|
||||
""" Stop the spinner """
|
||||
spinner.stop()
|
||||
|
||||
|
||||
###############################################
|
||||
# Worker for restic_stats
|
||||
###############################################
|
||||
|
|
@ -1266,8 +1249,8 @@ class WorkerResticRestore(QObject):
|
|||
universal_newlines=True)
|
||||
|
||||
output = process.stdout
|
||||
except Exception:
|
||||
self.mount_error.emit("Error while fetching the directory contents")
|
||||
except subprocess.CalledProcessError as error:
|
||||
self.mount_error.emit(error)
|
||||
|
||||
else:
|
||||
self.restore_finished.emit(output)
|
||||
|
|
@ -1380,8 +1363,8 @@ class WorkerResticMount(QObject):
|
|||
process.stdin.write(pwd)
|
||||
process.stdin.close()
|
||||
|
||||
except Exception:
|
||||
msg_box_error(self, "An error has occurred")
|
||||
except subprocess.CalledProcessError as error:
|
||||
pass
|
||||
|
||||
finally:
|
||||
# we give some time for our subprocess.Popen
|
||||
|
|
@ -1954,7 +1937,7 @@ class ActiveRow():
|
|||
mainWin.thread14.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
|
||||
#####################
|
||||
|
|
@ -3778,7 +3761,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_stats_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -3800,7 +3783,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_stats_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -3814,7 +3797,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_backup_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -3836,7 +3819,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_backup_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -3850,7 +3833,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_snapshots_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -3872,7 +3855,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_snapshots_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -3886,7 +3869,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_ls2_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -3908,7 +3891,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_ls2_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -3922,7 +3905,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_init_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -3946,7 +3929,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_init_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -3960,7 +3943,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_prune_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -3982,7 +3965,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_prune_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -3996,7 +3979,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_check_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -4018,7 +4001,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_check_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -4032,7 +4015,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_unlock_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -4054,7 +4037,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_unlock_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -4068,7 +4051,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_restore_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -4092,7 +4075,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_restore_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -4106,7 +4089,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_mount_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -4130,7 +4113,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_mount_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -4146,7 +4129,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_cache_finished(self, i):
|
||||
"""Signal from worker thread without an error"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -4170,7 +4153,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_cache_error(self, i):
|
||||
"""Signal from worker thread with an error!"""
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -4184,7 +4167,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_migrate_check_finished(self, i):
|
||||
""" Signal from worker thread without an error """
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -4206,7 +4189,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_migrate_check_error(self, i):
|
||||
""" Signal from worker thread with an error! """
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -4220,7 +4203,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_migrate_update_finished(self, i):
|
||||
""" Signal from worker thread without an error """
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
if not i:
|
||||
msg_box(self, "Nothing to do.")
|
||||
|
|
@ -4245,7 +4228,7 @@ class MainWindow(QMainWindow):
|
|||
def restic_migrate_update_error(self, i):
|
||||
""" Signal from worker thread with an error! """
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
msg_box_error(self, i)
|
||||
|
||||
|
|
@ -4259,7 +4242,7 @@ class MainWindow(QMainWindow):
|
|||
def call_repo_version_finished(self, i):
|
||||
""" Signal from worker thread without an error """
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -4314,7 +4297,7 @@ class MainWindow(QMainWindow):
|
|||
def call_repo_version_error(self, i):
|
||||
""" Signal from worker thread with an error! """
|
||||
|
||||
Spinner.stop(self)
|
||||
spinner.stop()
|
||||
|
||||
row = self.listWidget.currentRow()
|
||||
|
||||
|
|
@ -4454,7 +4437,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread10.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -4491,8 +4474,8 @@ class MainWindow(QMainWindow):
|
|||
msg_box(self, "UMount successful!")
|
||||
mainWin.widget.setPlainText("")
|
||||
|
||||
except Exception:
|
||||
msg_box_error(self, "An error has occurred!")
|
||||
except subprocess.CalledProcessError as error:
|
||||
msg_box_error(self, error)
|
||||
|
||||
# After umount, we will delete mount folder!
|
||||
try:
|
||||
|
|
@ -4506,8 +4489,8 @@ class MainWindow(QMainWindow):
|
|||
# We delete mount_path
|
||||
m_path[0].path = ""
|
||||
|
||||
except Exception:
|
||||
msg_box_error(self, result.stderr)
|
||||
except subprocess.CalledProcessError as error:
|
||||
msg_box_error(self, error)
|
||||
|
||||
else:
|
||||
pass
|
||||
|
|
@ -4593,7 +4576,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread9.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -4642,7 +4625,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread7.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -4688,7 +4671,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread12.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -4734,7 +4717,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread13.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -4780,7 +4763,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread11.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -4828,7 +4811,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -4852,8 +4835,8 @@ class MainWindow(QMainWindow):
|
|||
process.check_returncode()
|
||||
|
||||
mainWin.widget.setPlainText(process.stdout)
|
||||
except Exception:
|
||||
msg_box_error(self, process.stderr)
|
||||
except subprocess.CalledProcessError as error:
|
||||
msg_box_error(self, error)
|
||||
|
||||
self.statusBar().showMessage(("Restic version"))
|
||||
|
||||
|
|
@ -4894,7 +4877,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread6.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -4944,7 +4927,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread3.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -5019,7 +5002,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread4.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -5087,7 +5070,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread5.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -5136,7 +5119,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread2.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -5184,7 +5167,7 @@ class MainWindow(QMainWindow):
|
|||
self.thread8.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
self.statusBar().showMessage(backup_data[row].name)
|
||||
|
||||
|
|
@ -5226,7 +5209,7 @@ class MainWindow(QMainWindow):
|
|||
mainWin.thread14.start()
|
||||
|
||||
# we start waitingspinnerwidget
|
||||
Spinner.start(self)
|
||||
spinner.start()
|
||||
|
||||
# Set start parameter .isEnabled for menu Tools/Snapshots and Tools/List Snapshot.
|
||||
self.restic_ls.setEnabled(False)
|
||||
|
|
@ -5250,8 +5233,8 @@ class MainWindow(QMainWindow):
|
|||
capture_output=True,
|
||||
text=True)
|
||||
|
||||
except Exception:
|
||||
msg_box_error(self, result.stderr)
|
||||
except subprocess.CalledProcessError as error:
|
||||
msg_box_error(self, error)
|
||||
|
||||
else:
|
||||
pass
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue