Skip to content

Commit 809b423

Browse files
committed
allow no editor to be configured and not to load existing rules
1 parent 1118be1 commit 809b423

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

src/backend/rule_manager.py

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
from src.config.config_manager import ConfigManager
77
from src.widgets.widget_base_tile import BaseTile
88
from src.logger import BroadErrorHandler
9-
9+
import logging
10+
logger = logging.getLogger(__name__)
1011
RuleConfig = Dict[str, List[str]]
1112

1213

@@ -20,9 +21,10 @@ def __init__(self):
2021
def _loadRuleFile(self, filename_base):
2122
if not self._loadedRules:
2223
filename = f"{filename_base}.rules"
23-
data_path = Path(ConfigManager.config()["data_path"])
24+
data_path = ConfigManager.config()["data_path"]
2425
if not data_path:
2526
raise ValueError("No editor directory path known")
27+
data_path = Path(data_path)
2628

2729
automapper_path = data_path.joinpath(Path("editor/automap"))
2830
if not automapper_path.exists():
@@ -40,13 +42,17 @@ def _loadRuleFile(self, filename_base):
4042
self._header = []
4143
self._loadedRules = True
4244

43-
@BroadErrorHandler
45+
@BroadErrorHandler(logger)
4446
def loadRules(self, filename):
4547
if not self._loadedRules:
4648
filename = RuleManager._getFileBase(filename)
47-
self._loadRuleFile(filename)
49+
try:
50+
self._loadRuleFile(filename)
51+
except ValueError:
52+
return False
53+
return True
4854

49-
@BroadErrorHandler
55+
@BroadErrorHandler(logger)
5056
def saveRule(self, filename, rule_name):
5157
filename = RuleManager._getFileBase(filename)
5258
if not self._loadedRules:
@@ -57,7 +63,7 @@ def saveRule(self, filename, rule_name):
5763

5864
def getRules(self) -> List[str]:
5965
if not self._loadedRules:
60-
raise ValueError("Rules are not loaded yet")
66+
return []
6167
return list(self._config.keys())
6268

6369
@staticmethod

src/config/config_manager.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def _checkConfig(self) -> bool:
4343
return updated
4444

4545
def createConfig(self):
46-
client_path = ""
47-
data_path = ""
46+
client_path = None
47+
data_path = None
4848
# noinspection PyBroadException
4949
try:
5050
client_path = StorageFinder.instance().getClientPath()

src/widgets/widget_mapper_generator.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
from src.config.config_manager import ConfigManager
1313
from src.backend.map_generator import MapGenerator
1414
from src.logger import BroadErrorHandler
15+
import logging
16+
logger = logging.getLogger(__name__)
1517

1618

1719
class MapperGeneratorWidget(QWidget):
@@ -135,7 +137,7 @@ def ruleNameToggle(self):
135137
self.existing_mapper.show()
136138
self._updateGenerateButton()
137139

138-
@BroadErrorHandler
140+
@BroadErrorHandler(logger)
139141
def startDDNetCheck(self):
140142
# TODO
141143
# generate Map

0 commit comments

Comments
 (0)