diff --git a/CB/Core.py b/CB/Core.py index 5756b6e..c45187c 100644 --- a/CB/Core.py +++ b/CB/Core.py @@ -434,9 +434,8 @@ def find_orphans(self): orphaneconfig = [] directories = [] directoriesspecial = [] - ignored = ['.DS_Store'] - special = ['+Wowhead_Looter', 'CurseBreakerCompanion', 'SharedMedia_MyMedia', 'WeakAurasCompanion', - 'TradeSkillMaster_AppHelper'] + ignored = ['.DS_Store', '.git'] + special = ['+Wowhead_Looter', 'CurseBreakerCompanion', 'SharedMedia_MyMedia', 'TradeSkillMaster_AppHelper'] for addon in self.config['Addons']: for directory in addon['Directories']: directories.append(directory) @@ -596,6 +595,7 @@ def detect_accounts(self): accounts_processed.append(account) return accounts_processed + # TODO: Refactor to be smarter def detect_addons(self): if self.config['WAAAPIKey'] == '': raise RuntimeError('This feature only matches addons that are in the database of the Wago Addons. Other sou' @@ -609,7 +609,7 @@ def detect_addons(self): output = [] ignored = ['ElvUI_OptionsUI', 'ElvUI_Options', 'ElvUI_Libraries', 'Tukui_Config', '+Wowhead_Looter', 'WeakAurasCompanion', 'CurseBreakerCompanion', 'SharedMedia_MyMedia', 'TradeSkillMaster_AppHelper', - '.DS_Store'] + 'WagoAnalytics', 'WagoAppCompanion', 'Details_Streamer', 'Details_Vanguard', '.DS_Store', '.git'] specialcases = ['ElvUI', 'Tukui'] addon_dirs = os.listdir(self.path) diff --git a/CB/__init__.py b/CB/__init__.py index eb9d40d..1b760ae 100644 --- a/CB/__init__.py +++ b/CB/__init__.py @@ -1,6 +1,6 @@ import httpx -__version__ = '4.7.0' +__version__ = '4.7.1' __license__ = 'GPLv3' __copyright__ = '2019-2024, Paweł Jastrzębski ' __docformat__ = 'restructuredtext en' diff --git a/CurseBreaker.py b/CurseBreaker.py index cba5863..2207253 100644 --- a/CurseBreaker.py +++ b/CurseBreaker.py @@ -336,7 +336,7 @@ def handle_shutdown(self, message=''): sys.exit(0) else: self.console.print(message) - self.handle_keypress('\nPress any button to continue...', 0, False) + self.handle_keypress('Press any button to continue...', 0, False) sys.exit(1) def print_header(self): diff --git a/Pipfile.lock b/Pipfile.lock index cdb26ba..ae3fc4a 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -316,11 +316,11 @@ }, "pygments": { "hashes": [ - "sha256:b27c2826c47d0f3219f29554824c30c5e8945175d888647acd804ddd04af846c", - "sha256:da46cec9fd2de5be3a8a784f434e4c4ab670b4ff54d605c4c2717e9d49c4c367" + "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199", + "sha256:b8e6aca0523f3ab76fee51799c488e38782ac06eafcf95e7ba832985c8e7b13a" ], - "markers": "python_version >= '3.7'", - "version": "==2.17.2" + "markers": "python_version >= '3.8'", + "version": "==2.18.0" }, "pyperclip": { "hashes": [ @@ -392,27 +392,27 @@ "develop": { "ruff": { "hashes": [ - "sha256:0e2e06459042ac841ed510196c350ba35a9b24a643e23db60d79b2db92af0c2b", - "sha256:1f32cadf44c2020e75e0c56c3408ed1d32c024766bd41aedef92aa3ca28eef68", - "sha256:22e306bf15e09af45ca812bc42fa59b628646fa7c26072555f278994890bc7ac", - "sha256:24016ed18db3dc9786af103ff49c03bdf408ea253f3cb9e3638f39ac9cf2d483", - "sha256:33bcc160aee2520664bc0859cfeaebc84bb7323becff3f303b8f1f2d81cb4edc", - "sha256:3afabaf7ba8e9c485a14ad8f4122feff6b2b93cc53cd4dad2fd24ae35112d5c5", - "sha256:5ec481661fb2fd88a5d6cf1f83403d388ec90f9daaa36e40e2c003de66751798", - "sha256:652e4ba553e421a6dc2a6d4868bc3b3881311702633eb3672f9f244ded8908cd", - "sha256:6a2243f8f434e487c2a010c7252150b1fdf019035130f41b77626f5655c9ca22", - "sha256:6ab165ef5d72392b4ebb85a8b0fbd321f69832a632e07a74794c0e598e7a8376", - "sha256:7891ee376770ac094da3ad40c116258a381b86c7352552788377c6eb16d784fe", - "sha256:799eb468ea6bc54b95527143a4ceaf970d5aa3613050c6cff54c85fda3fde480", - "sha256:82986bb77ad83a1719c90b9528a9dd663c9206f7c0ab69282af8223566a0c34e", - "sha256:8772130a063f3eebdf7095da00c0b9898bd1774c43b336272c3e98667d4fb8fa", - "sha256:8d14dc8953f8af7e003a485ef560bbefa5f8cc1ad994eebb5b12136049bbccc5", - "sha256:cbd1e87c71bca14792948c4ccb51ee61c3296e164019d2d484f3eaa2d360dfaf", - "sha256:ec4ba9436a51527fb6931a8839af4c36a5481f8c19e8f5e42c2f7ad3a49f5069" + "sha256:08a0d6a22918ab2552ace96adeaca308833873a4d7d1d587bb1d37bae8728eb3", + "sha256:0bfc9e955e6dc6359eb6f82ea150c4f4e82b660e5b58d9a20a0e42ec3bb6342b", + "sha256:18b00e0bcccf0fc8d7186ed21e311dffd19761cb632241a6e4fe4477cc80ef6e", + "sha256:25cacda2155778beb0d064e0ec5a3944dcca9c12715f7c4634fd9d93ac33fd30", + "sha256:262f5635e2c74d80b7507fbc2fac28fe0d4fef26373bbc62039526f7722bca1b", + "sha256:29efff25bf9ee685c2c8390563a5b5c006a3fee5230d28ea39f4f75f9d0b6f2f", + "sha256:510a67d232d2ebe983fddea324dbf9d69b71c4d2dfeb8a862f4a127536dd4cfb", + "sha256:71ca5f8ccf1121b95a59649482470c5601c60a416bf189d553955b0338e34614", + "sha256:7363691198719c26459e08cc17c6a3dac6f592e9ea3d2fa772f4e561b5fe82a3", + "sha256:7a1c3a450bc6539ef00da6c819fb1b76b6b065dec585f91456e7c0d6a0bbc725", + "sha256:819fb06d535cc76dfddbfe8d3068ff602ddeb40e3eacbc90e0d1272bb8d97113", + "sha256:927b11c1e4d0727ce1a729eace61cee88a334623ec424c0b1c8fe3e5f9d3c865", + "sha256:b70800c290f14ae6fcbb41bbe201cf62dfca024d124a1f373e76371a007454ce", + "sha256:dc9ff11cd9a092ee7680a56d21f302bdda14327772cd870d806610a3503d001f", + "sha256:eba1f14df3c758dd7de5b55fbae7e1c8af238597961e5fb628f3de446c3c40c5", + "sha256:eeb039f8428fcb6725bb63cbae92ad67b0559e68b5d80f840f11914afd8ddf7f", + "sha256:ff0a3ef2e3c4b6d133fbedcf9586abfbe38d076041f2dc18ffb2c7e0485d5a07" ], "index": "pypi", "markers": "python_version >= '3.7'", - "version": "==0.4.2" + "version": "==0.4.3" }, "sourcery": { "hashes": [