Skip to content

Commit cc07510

Browse files
TsunaMooTsunaMoo
committed
Cleanup for Linting
1 parent 1a6b157 commit cc07510

17 files changed

Lines changed: 320 additions & 502 deletions

‎games/game_batmanlegacy.py‎

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,6 @@ def __init__(self, organizer: mobase.IOrganizer):
9595
self.processedBasenames: set[str] = set() # Track already-grouped files
9696
self.category_groups: dict[str, list[mobase.FileTreeEntry]] = {}
9797

98-
def moveOverwriteMerge(self, source: str, destination: str):
99-
if not os.path.exists(destination):
100-
shutil.move(source, destination)
101-
return
102-
if os.path.isfile(source):
103-
os.replace(source, destination)
104-
return
105-
for item in os.listdir(source):
106-
s_item = os.path.join(source, item)
107-
d_item = os.path.join(destination, item)
108-
self.moveOverwriteMerge(s_item, d_item)
109-
os.rmdir(source)
110-
11198
def sanitizeFolderName(self, name: str) -> str:
11299
invalid_chars = '+&<>:"|?*\\/'
113100
for char in invalid_chars:
@@ -164,18 +151,19 @@ def moveTreeContent(
164151
targettree.move(entry, destination, mobase.IFileTree.MERGE)
165152
elif installtype == "os":
166153
entry = entries[0]
167-
for subentry in entry:
168-
mod_file = subentry.name()
169-
mod_name_val = entry.name()
170-
mod_path = os.path.join(self.organizer.modsPath(), mod_name_val)
171-
insideMods = os.path.join(mod_path, destination)
172-
os.makedirs(insideMods, exist_ok=True)
173-
src = os.path.join(mod_path, mod_file)
174-
dst = os.path.join(mod_path, destination, mod_file)
175-
shutil.move(
176-
src,
177-
dst,
178-
)
154+
if isinstance(entry, mobase.IFileTree):
155+
for subentry in entry:
156+
mod_file = subentry.name()
157+
mod_name_val = entry.name()
158+
mod_path = os.path.join(self.organizer.modsPath(), mod_name_val)
159+
insideMods = os.path.join(mod_path, destination)
160+
os.makedirs(insideMods, exist_ok=True)
161+
src = os.path.join(mod_path, mod_file)
162+
dst = os.path.join(mod_path, destination, mod_file)
163+
shutil.move(
164+
src,
165+
dst,
166+
)
179167
return None
180168

181169
def addModDetectionCandidate(
@@ -221,12 +209,12 @@ def showModDetectionDialog(self) -> set[int] | None:
221209
selectButtons = QHBoxLayout()
222210
selectAllButton = QPushButton("Select All")
223211
selectNoneButton = QPushButton("Select None")
224-
selectAllButton.clicked.connect(
212+
selectAllButton.clicked.connect( # type: ignore # type: ignore
225213
lambda: self.setDialogSelection(listWidget, True)
226-
) # type: ignore
227-
selectNoneButton.clicked.connect(
214+
)
215+
selectNoneButton.clicked.connect( # type: ignore # type: ignore
228216
lambda: self.setDialogSelection(listWidget, False)
229-
) # type: ignore
217+
)
230218
selectButtons.addWidget(selectAllButton)
231219
selectButtons.addWidget(selectNoneButton)
232220
layout.addLayout(selectButtons)
@@ -348,9 +336,9 @@ def collectModCandidates(
348336
candidate_entries = entries
349337

350338
if category == "Root":
351-
candidate_entries = []
339+
candidate_entries: list[mobase.FileTreeEntry] = []
352340
for root_entry in entries:
353-
if root_entry.isDir():
341+
if isinstance(root_entry, mobase.IFileTree) and root_entry.isDir():
354342
candidate_entries.extend(list(root_entry))
355343
else:
356344
candidate_entries.append(root_entry)

‎games/game_crimeboss.py‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -190,18 +190,19 @@ def moveTreeContent(
190190
targettree.move(entry, destination, mobase.IFileTree.MERGE)
191191
elif installtype == "os":
192192
entry = entries[0]
193-
for subentry in entry:
194-
mod_file = subentry.name()
195-
mod_name_val = entry.name()
196-
mod_path = os.path.join(self.organizer.modsPath(), mod_name_val)
197-
insideMods = os.path.join(mod_path, destination)
198-
os.makedirs(insideMods, exist_ok=True)
199-
src = os.path.join(mod_path, mod_file)
200-
dst = os.path.join(mod_path, destination, mod_file)
201-
shutil.move(
202-
src,
203-
dst,
204-
)
193+
if isinstance(entry, mobase.IFileTree):
194+
for subentry in entry:
195+
mod_file = subentry.name()
196+
mod_name_val = entry.name()
197+
mod_path = os.path.join(self.organizer.modsPath(), mod_name_val)
198+
insideMods = os.path.join(mod_path, destination)
199+
os.makedirs(insideMods, exist_ok=True)
200+
src = os.path.join(mod_path, mod_file)
201+
dst = os.path.join(mod_path, destination, mod_file)
202+
shutil.move(
203+
src,
204+
dst,
205+
)
205206
return None
206207

207208
def addModDetectionCandidate(
@@ -247,10 +248,10 @@ def showModDetectionDialog(self) -> set[int] | None:
247248
selectButtons = QHBoxLayout()
248249
selectAllButton = QPushButton("Select All")
249250
selectNoneButton = QPushButton("Select None")
250-
selectAllButton.clicked.connect(
251+
selectAllButton.clicked.connect( # type: ignore
251252
lambda: self.setDialogSelection(listWidget, True)
252253
) # type: ignore
253-
selectNoneButton.clicked.connect(
254+
selectNoneButton.clicked.connect( # type: ignore
254255
lambda: self.setDialogSelection(listWidget, False)
255256
) # type: ignore
256257
selectButtons.addWidget(selectAllButton)
@@ -380,9 +381,9 @@ def collectModCandidates(
380381
candidate_entries = entries
381382

382383
if group_category == "Root":
383-
candidate_entries = []
384+
candidate_entries: list[mobase.FileTreeEntry] = []
384385
for root_entry in entries:
385-
if root_entry.isDir():
386+
if isinstance(root_entry, mobase.IFileTree) and root_entry.isDir():
386387
candidate_entries.extend(list(root_entry))
387388
else:
388389
candidate_entries.append(root_entry)
@@ -528,8 +529,6 @@ def executableForcedLoads(self) -> list[mobase.ExecutableForcedLoadSetting]:
528529
tree: mobase.IFileTree | mobase.FileTreeEntry | None = (
529530
self._organizer.virtualFileTree()
530531
)
531-
if not isinstance(tree, mobase.IFileTree):
532-
return efls
533532
for e in tree:
534533
relpath = e.pathFrom(tree)
535534
if relpath and e.hasSuffix("dll") and relpath not in self.baseDlls:

‎games/game_enotria.py‎

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,6 @@ def __init__(self, organizer: mobase.IOrganizer):
9595
self.processedBasenames: set[str] = set() # Track already-grouped files
9696
self.category_groups: dict[str, list[mobase.FileTreeEntry]] = {}
9797

98-
def moveOverwriteMerge(self, source: str, destination: str):
99-
if not os.path.exists(destination):
100-
shutil.move(source, destination)
101-
return
102-
if os.path.isfile(source):
103-
os.replace(source, destination)
104-
return
105-
for item in os.listdir(source):
106-
s_item = os.path.join(source, item)
107-
d_item = os.path.join(destination, item)
108-
self.moveOverwriteMerge(s_item, d_item)
109-
os.rmdir(source)
110-
11198
def sanitizeFolderName(self, name: str) -> str:
11299
invalid_chars = '+&<>:"|?*\\/'
113100
for char in invalid_chars:
@@ -164,18 +151,19 @@ def moveTreeContent(
164151
targettree.move(entry, destination, mobase.IFileTree.MERGE)
165152
elif installtype == "os":
166153
entry = entries[0]
167-
for subentry in entry:
168-
mod_file = subentry.name()
169-
mod_name_val = entry.name()
170-
mod_path = os.path.join(self.organizer.modsPath(), mod_name_val)
171-
insideMods = os.path.join(mod_path, destination)
172-
os.makedirs(insideMods, exist_ok=True)
173-
src = os.path.join(mod_path, mod_file)
174-
dst = os.path.join(mod_path, destination, mod_file)
175-
shutil.move(
176-
src,
177-
dst,
178-
)
154+
if isinstance(entry, mobase.IFileTree):
155+
for subentry in entry:
156+
mod_file = subentry.name()
157+
mod_name_val = entry.name()
158+
mod_path = os.path.join(self.organizer.modsPath(), mod_name_val)
159+
insideMods = os.path.join(mod_path, destination)
160+
os.makedirs(insideMods, exist_ok=True)
161+
src = os.path.join(mod_path, mod_file)
162+
dst = os.path.join(mod_path, destination, mod_file)
163+
shutil.move(
164+
src,
165+
dst,
166+
)
179167
return None
180168

181169
def addModDetectionCandidate(
@@ -221,12 +209,12 @@ def showModDetectionDialog(self) -> set[int] | None:
221209
selectButtons = QHBoxLayout()
222210
selectAllButton = QPushButton("Select All")
223211
selectNoneButton = QPushButton("Select None")
224-
selectAllButton.clicked.connect(
212+
selectAllButton.clicked.connect( # type: ignore # type: ignore
225213
lambda: self.setDialogSelection(listWidget, True)
226-
) # type: ignore
227-
selectNoneButton.clicked.connect(
214+
)
215+
selectNoneButton.clicked.connect( # type: ignore # type: ignore
228216
lambda: self.setDialogSelection(listWidget, False)
229-
) # type: ignore
217+
)
230218
selectButtons.addWidget(selectAllButton)
231219
selectButtons.addWidget(selectNoneButton)
232220
layout.addLayout(selectButtons)
@@ -348,9 +336,9 @@ def collectModCandidates(
348336
candidate_entries = entries
349337

350338
if category == "Root":
351-
candidate_entries = []
339+
candidate_entries: list[mobase.FileTreeEntry] = []
352340
for root_entry in entries:
353-
if root_entry.isDir():
341+
if isinstance(root_entry, mobase.IFileTree) and root_entry.isDir():
354342
candidate_entries.extend(list(root_entry))
355343
else:
356344
candidate_entries.append(root_entry)

‎games/game_goatsimulator3.py‎

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,6 @@ def __init__(self, organizer: mobase.IOrganizer):
9595
self.processedBasenames: set[str] = set() # Track already-grouped files
9696
self.category_groups: dict[str, list[mobase.FileTreeEntry]] = {}
9797

98-
def moveOverwriteMerge(self, source: str, destination: str):
99-
if not os.path.exists(destination):
100-
shutil.move(source, destination)
101-
return
102-
if os.path.isfile(source):
103-
os.replace(source, destination)
104-
return
105-
for item in os.listdir(source):
106-
s_item = os.path.join(source, item)
107-
d_item = os.path.join(destination, item)
108-
self.moveOverwriteMerge(s_item, d_item)
109-
os.rmdir(source)
110-
11198
def sanitizeFolderName(self, name: str) -> str:
11299
invalid_chars = '+&<>:"|?*\\/'
113100
for char in invalid_chars:
@@ -164,18 +151,19 @@ def moveTreeContent(
164151
targettree.move(entry, destination, mobase.IFileTree.MERGE)
165152
elif installtype == "os":
166153
entry = entries[0]
167-
for subentry in entry:
168-
mod_file = subentry.name()
169-
mod_name_val = entry.name()
170-
mod_path = os.path.join(self.organizer.modsPath(), mod_name_val)
171-
insideMods = os.path.join(mod_path, destination)
172-
os.makedirs(insideMods, exist_ok=True)
173-
src = os.path.join(mod_path, mod_file)
174-
dst = os.path.join(mod_path, destination, mod_file)
175-
shutil.move(
176-
src,
177-
dst,
178-
)
154+
if isinstance(entry, mobase.IFileTree):
155+
for subentry in entry:
156+
mod_file = subentry.name()
157+
mod_name_val = entry.name()
158+
mod_path = os.path.join(self.organizer.modsPath(), mod_name_val)
159+
insideMods = os.path.join(mod_path, destination)
160+
os.makedirs(insideMods, exist_ok=True)
161+
src = os.path.join(mod_path, mod_file)
162+
dst = os.path.join(mod_path, destination, mod_file)
163+
shutil.move(
164+
src,
165+
dst,
166+
)
179167
return None
180168

181169
def addModDetectionCandidate(
@@ -221,12 +209,12 @@ def showModDetectionDialog(self) -> set[int] | None:
221209
selectButtons = QHBoxLayout()
222210
selectAllButton = QPushButton("Select All")
223211
selectNoneButton = QPushButton("Select None")
224-
selectAllButton.clicked.connect(
212+
selectAllButton.clicked.connect( # type: ignore # type: ignore
225213
lambda: self.setDialogSelection(listWidget, True)
226-
) # type: ignore
227-
selectNoneButton.clicked.connect(
214+
)
215+
selectNoneButton.clicked.connect( # type: ignore # type: ignore
228216
lambda: self.setDialogSelection(listWidget, False)
229-
) # type: ignore
217+
)
230218
selectButtons.addWidget(selectAllButton)
231219
selectButtons.addWidget(selectNoneButton)
232220
layout.addLayout(selectButtons)
@@ -348,9 +336,9 @@ def collectModCandidates(
348336
candidate_entries = entries
349337

350338
if category == "Root":
351-
candidate_entries = []
339+
candidate_entries: list[mobase.FileTreeEntry] = []
352340
for root_entry in entries:
353-
if root_entry.isDir():
341+
if isinstance(root_entry, mobase.IFileTree) and root_entry.isDir():
354342
candidate_entries.extend(list(root_entry))
355343
else:
356344
candidate_entries.append(root_entry)

‎games/game_goatsimulatorremaster.py‎

Lines changed: 19 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -95,19 +95,6 @@ def __init__(self, organizer: mobase.IOrganizer):
9595
self.processedBasenames: set[str] = set() # Track already-grouped files
9696
self.category_groups: dict[str, list[mobase.FileTreeEntry]] = {}
9797

98-
def moveOverwriteMerge(self, source: str, destination: str):
99-
if not os.path.exists(destination):
100-
shutil.move(source, destination)
101-
return
102-
if os.path.isfile(source):
103-
os.replace(source, destination)
104-
return
105-
for item in os.listdir(source):
106-
s_item = os.path.join(source, item)
107-
d_item = os.path.join(destination, item)
108-
self.moveOverwriteMerge(s_item, d_item)
109-
os.rmdir(source)
110-
11198
def sanitizeFolderName(self, name: str) -> str:
11299
invalid_chars = '+&<>:"|?*\\/'
113100
for char in invalid_chars:
@@ -164,18 +151,19 @@ def moveTreeContent(
164151
targettree.move(entry, destination, mobase.IFileTree.MERGE)
165152
elif installtype == "os":
166153
entry = entries[0]
167-
for subentry in entry:
168-
mod_file = subentry.name()
169-
mod_name_val = entry.name()
170-
mod_path = os.path.join(self.organizer.modsPath(), mod_name_val)
171-
insideMods = os.path.join(mod_path, destination)
172-
os.makedirs(insideMods, exist_ok=True)
173-
src = os.path.join(mod_path, mod_file)
174-
dst = os.path.join(mod_path, destination, mod_file)
175-
shutil.move(
176-
src,
177-
dst,
178-
)
154+
if isinstance(entry, mobase.IFileTree):
155+
for subentry in entry:
156+
mod_file = subentry.name()
157+
mod_name_val = entry.name()
158+
mod_path = os.path.join(self.organizer.modsPath(), mod_name_val)
159+
insideMods = os.path.join(mod_path, destination)
160+
os.makedirs(insideMods, exist_ok=True)
161+
src = os.path.join(mod_path, mod_file)
162+
dst = os.path.join(mod_path, destination, mod_file)
163+
shutil.move(
164+
src,
165+
dst,
166+
)
179167
return None
180168

181169
def addModDetectionCandidate(
@@ -221,12 +209,12 @@ def showModDetectionDialog(self) -> set[int] | None:
221209
selectButtons = QHBoxLayout()
222210
selectAllButton = QPushButton("Select All")
223211
selectNoneButton = QPushButton("Select None")
224-
selectAllButton.clicked.connect(
212+
selectAllButton.clicked.connect( # type: ignore # type: ignore
225213
lambda: self.setDialogSelection(listWidget, True)
226-
) # type: ignore
227-
selectNoneButton.clicked.connect(
214+
)
215+
selectNoneButton.clicked.connect( # type: ignore # type: ignore
228216
lambda: self.setDialogSelection(listWidget, False)
229-
) # type: ignore
217+
)
230218
selectButtons.addWidget(selectAllButton)
231219
selectButtons.addWidget(selectNoneButton)
232220
layout.addLayout(selectButtons)
@@ -348,9 +336,9 @@ def collectModCandidates(
348336
candidate_entries = entries
349337

350338
if category == "Root":
351-
candidate_entries = []
339+
candidate_entries: list[mobase.FileTreeEntry] = []
352340
for root_entry in entries:
353-
if root_entry.isDir():
341+
if isinstance(root_entry, mobase.IFileTree) and root_entry.isDir():
354342
candidate_entries.extend(list(root_entry))
355343
else:
356344
candidate_entries.append(root_entry)

0 commit comments

Comments
 (0)