Mercurial Repositories > eric / changeset
changeset
Introduced a default project tasks scan filter to exclude compiled PyQt6 form files.
Thu, 06 Mar 2025 17:44:49 +0100
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Thu, 06 Mar 2025 17:44:49 +0100
- branch
- eric7
- changeset 11165
- 24e1beb8779a
- parent 11164
- d0ca3e676654
- child 11166
- fd914f897dcf
Introduced a default project tasks scan filter to exclude compiled PyQt6 form files.
--- a/src/eric7/APIs/Python3/eric7.api Thu Mar 06 16:28:13 2025 +0100 +++ b/src/eric7/APIs/Python3/eric7.api Thu Mar 06 17:44:49 2025 +0100 @@ -10379,12 +10379,12 @@ eric7.Tasks.TaskViewer.TaskViewer.findParentTask?4(parentUid) eric7.Tasks.TaskViewer.TaskViewer.getGlobalTasks?4() eric7.Tasks.TaskViewer.TaskViewer.getProjectTasks?4() -eric7.Tasks.TaskViewer.TaskViewer.getTasksScanFilter?4() +eric7.Tasks.TaskViewer.TaskViewer.getProjectTasksScanFilter?4() eric7.Tasks.TaskViewer.TaskViewer.handlePreferencesChanged?4() eric7.Tasks.TaskViewer.TaskViewer.regenerateProjectTasks?4(quiet=False) eric7.Tasks.TaskViewer.TaskViewer.saveProjectTasks?4() eric7.Tasks.TaskViewer.TaskViewer.setProjectOpen?4(o=False) -eric7.Tasks.TaskViewer.TaskViewer.setTasksScanFilter?4(filterStr: str) +eric7.Tasks.TaskViewer.TaskViewer.setProjectTasksScanFilter?4(filterStr: str) eric7.Tasks.TaskViewer.TaskViewer.stopProjectTaskExtraction?4() eric7.Tasks.TaskViewer.TaskViewer?1(parent, project) eric7.Tasks.TasksFile.TasksFile.readFile?4(filename: str)
--- a/src/eric7/Documentation/Help/source.qhp Thu Mar 06 16:28:13 2025 +0100 +++ b/src/eric7/Documentation/Help/source.qhp Thu Mar 06 17:44:49 2025 +0100 @@ -17497,12 +17497,12 @@ <keyword name="TaskViewer.findParentTask" id="TaskViewer.findParentTask" ref="eric7.Tasks.TaskViewer.html#TaskViewer.findParentTask" /> <keyword name="TaskViewer.getGlobalTasks" id="TaskViewer.getGlobalTasks" ref="eric7.Tasks.TaskViewer.html#TaskViewer.getGlobalTasks" /> <keyword name="TaskViewer.getProjectTasks" id="TaskViewer.getProjectTasks" ref="eric7.Tasks.TaskViewer.html#TaskViewer.getProjectTasks" /> - <keyword name="TaskViewer.getTasksScanFilter" id="TaskViewer.getTasksScanFilter" ref="eric7.Tasks.TaskViewer.html#TaskViewer.getTasksScanFilter" /> + <keyword name="TaskViewer.getProjectTasksScanFilter" id="TaskViewer.getProjectTasksScanFilter" ref="eric7.Tasks.TaskViewer.html#TaskViewer.getProjectTasksScanFilter" /> <keyword name="TaskViewer.handlePreferencesChanged" id="TaskViewer.handlePreferencesChanged" ref="eric7.Tasks.TaskViewer.html#TaskViewer.handlePreferencesChanged" /> <keyword name="TaskViewer.regenerateProjectTasks" id="TaskViewer.regenerateProjectTasks" ref="eric7.Tasks.TaskViewer.html#TaskViewer.regenerateProjectTasks" /> <keyword name="TaskViewer.saveProjectTasks" id="TaskViewer.saveProjectTasks" ref="eric7.Tasks.TaskViewer.html#TaskViewer.saveProjectTasks" /> <keyword name="TaskViewer.setProjectOpen" id="TaskViewer.setProjectOpen" ref="eric7.Tasks.TaskViewer.html#TaskViewer.setProjectOpen" /> - <keyword name="TaskViewer.setTasksScanFilter" id="TaskViewer.setTasksScanFilter" ref="eric7.Tasks.TaskViewer.html#TaskViewer.setTasksScanFilter" /> + <keyword name="TaskViewer.setProjectTasksScanFilter" id="TaskViewer.setProjectTasksScanFilter" ref="eric7.Tasks.TaskViewer.html#TaskViewer.setProjectTasksScanFilter" /> <keyword name="TaskViewer.stopProjectTaskExtraction" id="TaskViewer.stopProjectTaskExtraction" ref="eric7.Tasks.TaskViewer.html#TaskViewer.stopProjectTaskExtraction" /> <keyword name="Tasks (Package)" id="Tasks (Package)" ref="index-eric7.Tasks.html" /> <keyword name="TasksFile" id="TasksFile" ref="eric7.Tasks.TasksFile.html#TasksFile" />
--- a/src/eric7/Documentation/Source/eric7.Tasks.TaskViewer.html Thu Mar 06 16:28:13 2025 +0100 +++ b/src/eric7/Documentation/Source/eric7.Tasks.TaskViewer.html Thu Mar 06 17:44:49 2025 +0100 @@ -300,7 +300,7 @@ <td>Public method to retrieve all project related tasks.</td> </tr> <tr> -<td><a href="#TaskViewer.getTasksScanFilter">getTasksScanFilter</a></td> +<td><a href="#TaskViewer.getProjectTasksScanFilter">getProjectTasksScanFilter</a></td> <td>Public method to get the project scan filter.</td> </tr> <tr> @@ -320,7 +320,7 @@ <td>Public slot to set the project status.</td> </tr> <tr> -<td><a href="#TaskViewer.setTasksScanFilter">setTasksScanFilter</a></td> +<td><a href="#TaskViewer.setProjectTasksScanFilter">setProjectTasksScanFilter</a></td> <td>Public method to set the project scan filter.</td> </tr> <tr> @@ -774,9 +774,9 @@ list of Task </dd> </dl> -<a NAME="TaskViewer.getTasksScanFilter" ID="TaskViewer.getTasksScanFilter"></a> -<h4>TaskViewer.getTasksScanFilter</h4> -<b>getTasksScanFilter</b>(<i></i>) +<a NAME="TaskViewer.getProjectTasksScanFilter" ID="TaskViewer.getProjectTasksScanFilter"></a> +<h4>TaskViewer.getProjectTasksScanFilter</h4> +<b>getProjectTasksScanFilter</b>(<i></i>) <p> Public method to get the project scan filter. </p> @@ -835,9 +835,9 @@ flag indicating the project status </dd> </dl> -<a NAME="TaskViewer.setTasksScanFilter" ID="TaskViewer.setTasksScanFilter"></a> -<h4>TaskViewer.setTasksScanFilter</h4> -<b>setTasksScanFilter</b>(<i>filterStr: str</i>) +<a NAME="TaskViewer.setProjectTasksScanFilter" ID="TaskViewer.setProjectTasksScanFilter"></a> +<h4>TaskViewer.setProjectTasksScanFilter</h4> +<b>setProjectTasksScanFilter</b>(<i>filterStr: str</i>) <p> Public method to set the project scan filter. </p>
--- a/src/eric7/Tasks/TaskViewer.py Thu Mar 06 16:28:13 2025 +0100 +++ b/src/eric7/Tasks/TaskViewer.py Thu Mar 06 17:44:49 2025 +0100 @@ -78,7 +78,8 @@ self.copyTask = None self.projectOpen = False self.project = project - self.__projectTasksScanFilter = "" + self.__projectTasksScanFilter = "*/Ui_*.py" + # Do not scan compiled PyQt6 form files of projects. self.taskFilter = TaskFilter() self.taskFilter.setActive(False) @@ -908,7 +909,7 @@ self.__projectTaskExtractionThread.requestInterrupt() self.__projectTaskExtractionThread.wait() - def getTasksScanFilter(self) -> str: + def getProjectTasksScanFilter(self) -> str: """ Public method to get the project scan filter. @@ -917,7 +918,7 @@ """ return self.__projectTasksScanFilter.strip() - def setTasksScanFilter(self, filterStr: str): + def setProjectTasksScanFilter(self, filterStr: str): """ Public method to set the project scan filter.
--- a/src/eric7/Tasks/TasksFile.py Thu Mar 06 16:28:13 2025 +0100 +++ b/src/eric7/Tasks/TasksFile.py Thu Mar 06 17:44:49 2025 +0100 @@ -38,6 +38,9 @@ super().__init__(parent) self.__isGlobal = isGlobal + # Do not scan compiled PyQt6 form files of projects. + self.__projectDefaultScanFilter = "*/Ui_*.py" + def writeFile(self, filename: str) -> bool: """ Public method to write the tasks data to a tasks JSON file. @@ -60,6 +63,7 @@ "saved": time.strftime("%Y-%m-%d, %H:%M:%S"), "warning": ("This file was generated automatically, do not edit."), } + # step 1: project scan filter tasksDict["ProjectScanFilter"] = "" @@ -77,9 +81,13 @@ } if Preferences.getProject("TimestampFile"): tasksDict["header"]["saved"] = time.strftime("%Y-%m-%d, %H:%M:%S") + # step 1: project scan filter + tasksScanFilter = ( + ericApp().getObject("TaskViewer").getProjectTasksScanFilter() + ) tasksDict["ProjectScanFilter"] = ( - ericApp().getObject("TaskViewer").getTasksScanFilter() + tasksScanFilter if tasksScanFilter else self.__projectDefaultScanFilter ) # step 2: tasks @@ -145,8 +153,11 @@ return False viewer = ericApp().getObject("TaskViewer") - if tasksDict["ProjectScanFilter"]: - viewer.setTasksScanFilter(tasksDict["ProjectScanFilter"]) + viewer.setProjectTasksScanFilter( + tasksDict["ProjectScanFilter"] + if tasksDict["ProjectScanFilter"] + else self.__projectDefaultScanFilter + ) addedTasks = [] for task in tasksDict["Tasks"]:
