Merge pull request #129 from Avasam/Recover-from-closed-capture-window

Recover from closed capture window Fixes #94

Author: Toufool

.flake8

@@ -12,6 +12,7 @@ per-file-ignores=
     __init__.pyi:Q000
 ; PyQt methods
 ignore-names=closeEvent,paintEvent,keyPressEvent,mousePressEvent,mouseMoveEvent,mouseReleaseEvent
-; TODO: Bring down to 15, same as SonarLint
-max-complexity=55
+; McCabe max-complexity is also taken care of by Pylint and doesn't fail teh build there
+; So this is the hard limit
+max-complexity=32
 inline-quotes="

.github/workflows/lint-and-build.yml

@@ -44,7 +44,7 @@ jobs:
           npm install -g pyright
       - run: scripts/compile_resources.bat
       - name: Analysing the code with ${{ job.name }}
-        run: pyright
+        run: pyright --warnings
   Pylint:
     runs-on: windows-latest
     strategy:

pyproject.toml

@@ -18,6 +18,7 @@ typeCheckingMode = "strict"
 ignore = [
   # Auto generated
   "src/gen/",
+  # We expect stub files to be incomplete or contain useless statements as they're external
   "typings/",
 ]
 reportMissingTypeStubs = "information"
@@ -36,7 +37,7 @@ reportUnknownMemberType = "none"
 # https://pylint.pycqa.org/en/latest/technical_reference/features.html
 [tool.pylint.REPORTS]
 # Just like default but any error will make drop to 9 or less
-evaluation = "10.0 - error - ((float(warning + refactor + convention) / statement) * 10)"
+evaluation = "10.0 - error - ((float(warning * 10 + refactor + convention) / statement) * 10)"
 [tool.pylint.MASTER]
 fail-under = 9.0
 # https://pylint.pycqa.org/en/latest/technical_reference/extensions.html
@@ -65,10 +66,10 @@ load-plugins = [
   # "pylint.extensions.for_any_all",
 ]
 ignore-paths = [
-  # Haven't looked into disabling specific rules per file
-  "^typings/.*$",
   # Auto generated
   "^src/gen/.*$",
+  # We expect stub files to be incomplete or contain useless statements as they're external
+  "^typings/.*$",
 ]
 # No need to mention the fixmes
 disable = ["fixme"]
@@ -78,7 +79,11 @@ extension-pkg-allow-list = ["PyQt6", "win32ui"]
 max-line-length = 120
 
 [tool.pylint.DESIGN]
-max-attributes = 15
+# Same as SonarLint
+max-args = 7
+# Arbitrary to 2 bytes
+max-attributes = 16
+max-locals = 16
 
 [tool.pylint.'MESSAGES CONTROL']
 # Same as SonarLint

scripts/lint.ps1

@@ -1,11 +1,49 @@
-echo "`nRunning Pyright..."
-pyright
+$originalDirectory = $pwd
+cd "$PSScriptRoot\.."
+Write-Host $Script:MyInvocation.MyCommand.Path
+$exitCodes = 0
 
-echo "`nRunning Pylint..."
+Write-Host "`nRunning Pyright..."
+pyright --warnings
+$exitCodes += $LastExitCode
+if ($LastExitCode -gt 0) {
+  Write-Host "`Pyright failed ($LastExitCode)" -ForegroundColor Red
+} else {
+  Write-Host "`Pyright passed" -ForegroundColor Green
+}
+
+Write-Host "`nRunning Pylint..."
 pylint --score=n --output-format=colorized $(git ls-files '**/*.py*')
+$exitCodes += $LastExitCode
+if ($LastExitCode -gt 0) {
+  Write-Host "`Pylint failed ($LastExitCode)" -ForegroundColor Red
+} else {
+  Write-Host "`Pylint passed" -ForegroundColor Green
+}
 
-echo "`nRunning Flake8..."
+Write-Host "`nRunning Flake8..."
 flake8
+$exitCodes += $LastExitCode
+if ($LastExitCode -gt 0) {
+  Write-Host "`Flake8 failed ($LastExitCode)" -ForegroundColor Red
+} else {
+  Write-Host "`Flake8 passed" -ForegroundColor Green
+}
 
-echo "`nRunning Bandit..."
+Write-Host "`nRunning Bandit..."
 bandit -f custom --silent --recursive src
+# $exitCodes += $LastExitCode # Returns 1 on low
+if ($LastExitCode -gt 0) {
+  Write-Host "`Bandit warning ($LastExitCode)" -ForegroundColor Yellow
+} else {
+  Write-Host "`Bandit passed" -ForegroundColor Green
+}
+
+
+if ($exitCodes -gt 0) {
+  Write-Host "`nLinting failed ($exitCodes)" -ForegroundColor Red
+} else {
+  Write-Host "`nLinting passed" -ForegroundColor Green
+}
+
+cd $originalDirectory

scripts/start.bat

@@ -1,2 +1,2 @@
 CALL "%~p0compile_resources.bat"
-py -3.9 "%~p0..\src\AutoSplit.py"
+py -3.9 "%~p0..\src\AutoSplit.py" %*