Merge pull request #2620 from strictdoc-project/stanislaw/path_filters

stanislaw · web-flow · commit 3bed5faca086 · 2025-12-29T16:31:59.000+01:00
chore(core): move file system-related classes to core/file_system
diff --git a/docs/strictdoc_21_L2_StrictDoc_Requirements.sdoc b/docs/strictdoc_21_L2_StrictDoc_Requirements.sdoc
@@ -684,8 +684,6 @@ RELATIONS:
   VALUE: SDOC-SSS-34
 - TYPE: Parent
   VALUE: DO178-3
-- TYPE: File
-  VALUE: strictdoc/core/document_finder.py
 
 [[/SECTION]]
 
diff --git a/strictdoc/backend/sdoc_source_code/coverage_reports/gcov.py b/strictdoc/backend/sdoc_source_code/coverage_reports/gcov.py
@@ -17,7 +17,7 @@
     FileEntryFormat,
     FileReference,
 )
-from strictdoc.core.file_tree import File
+from strictdoc.core.file_system.file_tree import File
 from strictdoc.core.project_config import ProjectConfig
 from strictdoc.helpers.file_system import file_open_read_utf8
 
diff --git a/strictdoc/backend/sdoc_source_code/models/source_file_info.py b/strictdoc/backend/sdoc_source_code/models/source_file_info.py
@@ -12,7 +12,7 @@
     RangeMarker,
 )
 from strictdoc.backend.sdoc_source_code.models.source_node import SourceNode
-from strictdoc.core.source_tree import SourceFile
+from strictdoc.core.file_system.source_tree import SourceFile
 from strictdoc.helpers.auto_described import auto_described
 from strictdoc.helpers.file_stats import SourceFileStats
 
diff --git a/strictdoc/backend/sdoc_source_code/test_reports/junit_xml_reader.py b/strictdoc/backend/sdoc_source_code/test_reports/junit_xml_reader.py
@@ -18,7 +18,7 @@
     FileEntryFormat,
     FileReference,
 )
-from strictdoc.core.file_tree import File
+from strictdoc.core.file_system.file_tree import File
 from strictdoc.core.project_config import ProjectConfig
 from strictdoc.helpers.cast import assert_cast, assert_optional_cast
 from strictdoc.helpers.file_system import file_open_read_utf8
diff --git a/strictdoc/backend/sdoc_source_code/test_reports/robot_xml_reader.py b/strictdoc/backend/sdoc_source_code/test_reports/robot_xml_reader.py
@@ -16,7 +16,7 @@
     FileEntryFormat,
     FileReference,
 )
-from strictdoc.core.file_tree import File
+from strictdoc.core.file_system.file_tree import File
 from strictdoc.core.project_config import ProjectConfig
 from strictdoc.helpers.paths import path_to_posix_path
 
diff --git a/strictdoc/core/document_tree.py b/strictdoc/core/document_tree.py
@@ -2,8 +2,8 @@
 
 from strictdoc.backend.sdoc.models.document import SDocDocument
 from strictdoc.backend.sdoc.models.document_grammar import DocumentGrammar
-from strictdoc.core.file_tree import FileTree
-from strictdoc.core.source_tree import SourceTree
+from strictdoc.core.file_system.file_tree import FileTree
+from strictdoc.core.file_system.source_tree import SourceTree
 
 
 class DocumentTree:
diff --git a/strictdoc/core/document_tree_iterator.py b/strictdoc/core/document_tree_iterator.py
@@ -2,7 +2,7 @@
 from typing import Iterator
 
 from strictdoc.core.document_tree import DocumentTree
-from strictdoc.core.file_tree import File, FileOrFolderEntry, Folder
+from strictdoc.core.file_system.file_tree import File, FileOrFolderEntry, Folder
 
 
 class DocumentTreeIterator:
diff --git a/strictdoc/core/file_system/document_finder.py b/strictdoc/core/file_system/document_finder.py
@@ -1,5 +1,5 @@
 """
-@relation(SDOC-SRS-104, scope=file)
+@relation(SDOC-SRS-104, SDOC-SRS-115, scope=file)
 """
 
 import os
@@ -24,7 +24,7 @@
 from strictdoc.core.asset_manager import AssetManager
 from strictdoc.core.document_meta import DocumentMeta
 from strictdoc.core.document_tree import DocumentTree
-from strictdoc.core.file_tree import (
+from strictdoc.core.file_system.file_tree import (
     File,
     FileFinder,
     FileTree,
diff --git a/strictdoc/core/file_system/file_tree.py b/strictdoc/core/file_system/file_tree.py
diff --git a/strictdoc/core/file_system/source_files_finder.py b/strictdoc/core/file_system/source_files_finder.py
@@ -2,9 +2,9 @@
 from pathlib import Path
 from typing import List
 
-from strictdoc.core.file_tree import File, FileFinder
+from strictdoc.core.file_system.file_tree import File, FileFinder
+from strictdoc.core.file_system.source_tree import SourceFile, SourceTree
 from strictdoc.core.project_config import ProjectConfig
-from strictdoc.core.source_tree import SourceFile, SourceTree
 
 
 class SourceFilesFinder:
diff --git a/strictdoc/core/file_system/source_tree.py b/strictdoc/core/file_system/source_tree.py
@@ -6,7 +6,7 @@
 from enum import Enum
 from typing import Dict, List, Sequence
 
-from strictdoc.core.file_tree import File, FileTree
+from strictdoc.core.file_system.file_tree import File, FileTree
 from strictdoc.helpers.auto_described import auto_described
 
 
diff --git a/strictdoc/core/file_traceability_index.py b/strictdoc/core/file_traceability_index.py
@@ -42,8 +42,8 @@
 from strictdoc.backend.sdoc_source_code.models.source_node import SourceNode
 from strictdoc.core.constants import GraphLinkType
 from strictdoc.core.document_iterator import SDocDocumentIterator
+from strictdoc.core.file_system.source_tree import SourceFile
 from strictdoc.core.project_config import ProjectConfig, SourceNodesEntry
-from strictdoc.core.source_tree import SourceFile
 from strictdoc.helpers.cast import assert_cast
 from strictdoc.helpers.exception import StrictDocException
 from strictdoc.helpers.google_test import convert_function_name_to_gtest_macro
diff --git a/strictdoc/core/finders/__init__.py b/strictdoc/core/finders/__init__.py
diff --git a/strictdoc/core/traceability_index.py b/strictdoc/core/traceability_index.py
@@ -27,11 +27,11 @@
 from strictdoc.core.document_meta import DocumentMeta
 from strictdoc.core.document_tree import DocumentTree
 from strictdoc.core.file_dependency_manager import FileDependencyManager
+from strictdoc.core.file_system.source_tree import SourceFile
 from strictdoc.core.file_traceability_index import FileTraceabilityIndex
 from strictdoc.core.graph.abstract_bucket import ALL_EDGES
 from strictdoc.core.graph_database import GraphDatabase
 from strictdoc.core.project_config import ProjectConfig
-from strictdoc.core.source_tree import SourceFile
 from strictdoc.core.transforms.validation_error import (
     SingleValidationError,
 )
diff --git a/strictdoc/core/traceability_index_builder.py b/strictdoc/core/traceability_index_builder.py
@@ -31,14 +31,15 @@
     SourceFileTraceabilityCachingReader,
 )
 from strictdoc.core.constants import GraphLinkType
-from strictdoc.core.document_finder import DocumentFinder
 from strictdoc.core.document_iterator import SDocDocumentIterator
 from strictdoc.core.document_tree import DocumentTree
 from strictdoc.core.file_dependency_manager import FileDependencyManager
-from strictdoc.core.file_traceability_index import FileTraceabilityIndex
-from strictdoc.core.finders.source_files_finder import (
+from strictdoc.core.file_system.document_finder import DocumentFinder
+from strictdoc.core.file_system.source_files_finder import (
     SourceFilesFinder,
 )
+from strictdoc.core.file_system.source_tree import SourceFile, SourceTree
+from strictdoc.core.file_traceability_index import FileTraceabilityIndex
 from strictdoc.core.graph.many_to_many_set import ManyToManySet
 from strictdoc.core.graph.one_to_one_dictionary import OneToOneDictionary
 from strictdoc.core.graph_database import GraphDatabase
@@ -52,7 +53,6 @@
     QueryObject,
 )
 from strictdoc.core.query_engine.query_reader import QueryReader
-from strictdoc.core.source_tree import SourceFile, SourceTree
 from strictdoc.core.traceability_index import (
     TraceabilityIndex,
 )
diff --git a/strictdoc/export/html/generators/source_file_coverage.py b/strictdoc/export/html/generators/source_file_coverage.py
@@ -10,8 +10,8 @@
 from strictdoc.backend.sdoc_source_code.models.source_file_info import (
     SourceFileTraceabilityInfo,
 )
+from strictdoc.core.file_system.source_tree import SourceFile
 from strictdoc.core.project_config import ProjectConfig
-from strictdoc.core.source_tree import SourceFile
 from strictdoc.core.traceability_index import TraceabilityIndex
 from strictdoc.export.html.html_templates import HTMLTemplates, JinjaEnvironment
 from strictdoc.export.html.renderers.link_renderer import LinkRenderer
diff --git a/strictdoc/export/html/generators/source_file_view_generator.py b/strictdoc/export/html/generators/source_file_view_generator.py
@@ -33,8 +33,8 @@
 from strictdoc.backend.sdoc_source_code.models.source_file_info import (
     SourceFileTraceabilityInfo,
 )
+from strictdoc.core.file_system.source_tree import SourceFile
 from strictdoc.core.project_config import ProjectConfig
-from strictdoc.core.source_tree import SourceFile
 from strictdoc.core.traceability_index import TraceabilityIndex
 from strictdoc.export.html.generators.view_objects.source_file_view_object import (
     SourceFileViewObject,
diff --git a/strictdoc/export/html/generators/view_objects/document_screen_view_object.py b/strictdoc/export/html/generators/view_objects/document_screen_view_object.py
@@ -23,7 +23,7 @@
 from strictdoc.core.document_iterator import DocumentIterationContext
 from strictdoc.core.document_tree import DocumentTree
 from strictdoc.core.document_tree_iterator import DocumentTreeIterator
-from strictdoc.core.file_tree import File, FileOrFolderEntry, Folder
+from strictdoc.core.file_system.file_tree import File, FileOrFolderEntry, Folder
 from strictdoc.core.project_config import ProjectConfig
 from strictdoc.core.traceability_index import TraceabilityIndex
 from strictdoc.export.html.document_type import DocumentType
diff --git a/strictdoc/export/html/generators/view_objects/helpers.py b/strictdoc/export/html/generators/view_objects/helpers.py
@@ -1,4 +1,4 @@
-from strictdoc.core.file_tree import File, Folder
+from strictdoc.core.file_system.file_tree import File, Folder
 from strictdoc.core.project_config import ProjectConfig
 from strictdoc.core.traceability_index import TraceabilityIndex
 
diff --git a/strictdoc/export/html/generators/view_objects/project_tree_view_object.py b/strictdoc/export/html/generators/view_objects/project_tree_view_object.py
@@ -13,7 +13,7 @@
 from strictdoc.backend.sdoc.models.node import SDocNode
 from strictdoc.core.document_tree import DocumentTree
 from strictdoc.core.document_tree_iterator import DocumentTreeIterator
-from strictdoc.core.file_tree import File, Folder
+from strictdoc.core.file_system.file_tree import File, Folder
 from strictdoc.core.project_config import ProjectConfig
 from strictdoc.core.traceability_index import TraceabilityIndex
 from strictdoc.export.html.generators.view_objects.helpers import (
diff --git a/strictdoc/export/html/generators/view_objects/search_screen_view_object.py b/strictdoc/export/html/generators/view_objects/search_screen_view_object.py
@@ -19,9 +19,9 @@
 from strictdoc.backend.sdoc.models.node import SDocNode
 from strictdoc.core.document_tree import DocumentTree
 from strictdoc.core.document_tree_iterator import DocumentTreeIterator
-from strictdoc.core.file_tree import FileOrFolderEntry
+from strictdoc.core.file_system.file_tree import FileOrFolderEntry
+from strictdoc.core.file_system.source_tree import SourceFile
 from strictdoc.core.project_config import ProjectConfig
-from strictdoc.core.source_tree import SourceFile
 from strictdoc.core.traceability_index import TraceabilityIndex
 from strictdoc.export.html.document_type import DocumentType
 from strictdoc.export.html.html_templates import HTMLTemplates, JinjaEnvironment
diff --git a/strictdoc/export/html/generators/view_objects/source_file_view_object.py b/strictdoc/export/html/generators/view_objects/source_file_view_object.py
@@ -27,8 +27,8 @@
 )
 from strictdoc.core.document_tree import DocumentTree
 from strictdoc.core.document_tree_iterator import DocumentTreeIterator
+from strictdoc.core.file_system.source_tree import SourceFile
 from strictdoc.core.project_config import ProjectConfig
-from strictdoc.core.source_tree import SourceFile
 from strictdoc.core.traceability_index import TraceabilityIndex
 from strictdoc.export.html.document_type import DocumentType
 from strictdoc.export.html.html_templates import JinjaEnvironment
diff --git a/strictdoc/export/html/html_generator.py b/strictdoc/export/html/html_generator.py
@@ -12,8 +12,8 @@
 from strictdoc.backend.sdoc.models.document import SDocDocument
 from strictdoc.core.asset_manager import AssetDir
 from strictdoc.core.document_meta import DocumentMeta
+from strictdoc.core.file_system.source_tree import SourceTree
 from strictdoc.core.project_config import ProjectConfig, ProjectFeature
-from strictdoc.core.source_tree import SourceTree
 from strictdoc.core.traceability_index import TraceabilityIndex
 from strictdoc.export.html.document_type import DocumentType
 from strictdoc.export.html.generators.document import DocumentHTMLGenerator
diff --git a/strictdoc/export/html/renderers/link_renderer.py b/strictdoc/export/html/renderers/link_renderer.py
@@ -7,7 +7,7 @@
 from strictdoc.backend.sdoc_source_code.models.range_marker import (
     RangeMarker,
 )
-from strictdoc.core.source_tree import SourceFile
+from strictdoc.core.file_system.source_tree import SourceFile
 from strictdoc.export.html.document_type import DocumentType
 from strictdoc.helpers.cast import assert_cast
 from strictdoc.helpers.string import create_safe_title_string
diff --git a/tests/unit/strictdoc/backend/sdoc_source_code/test_reports/test_junit_xml_reader_ctest.py b/tests/unit/strictdoc/backend/sdoc_source_code/test_reports/test_junit_xml_reader_ctest.py
@@ -12,7 +12,7 @@
 from strictdoc.backend.sdoc_source_code.test_reports.junit_xml_reader import (
     JUnitXMLReader,
 )
-from strictdoc.core.file_tree import File
+from strictdoc.core.file_system.file_tree import File
 from strictdoc.core.project_config import ProjectConfig
 from strictdoc.helpers.cast import assert_cast
 from strictdoc.helpers.paths import SDocRelativePath
diff --git a/tests/unit/strictdoc/core/test_file_tree.py b/tests/unit/strictdoc/core/test_file_tree.py
@@ -2,7 +2,12 @@
 import tempfile
 from pathlib import Path
 
-from strictdoc.core.file_tree import File, FileFinder, FileTree, Folder
+from strictdoc.core.file_system.file_tree import (
+    File,
+    FileFinder,
+    FileTree,
+    Folder,
+)
 
 
 def test_01():

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`FileEntryFormat,`
`18`	`18`	`FileReference,`
`19`	`19`	`)`
`20`		`-from strictdoc.core.file_tree import File`
	`20`	`+from strictdoc.core.file_system.file_tree import File`
`21`	`21`	`from strictdoc.core.project_config import ProjectConfig`
`22`	`22`	`from strictdoc.helpers.file_system import file_open_read_utf8`
`23`	`23`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`RangeMarker,`
`13`	`13`	`)`
`14`	`14`	`from strictdoc.backend.sdoc_source_code.models.source_node import SourceNode`
`15`		`-from strictdoc.core.source_tree import SourceFile`
	`15`	`+from strictdoc.core.file_system.source_tree import SourceFile`
`16`	`16`	`from strictdoc.helpers.auto_described import auto_described`
`17`	`17`	`from strictdoc.helpers.file_stats import SourceFileStats`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`FileEntryFormat,`
`19`	`19`	`FileReference,`
`20`	`20`	`)`
`21`		`-from strictdoc.core.file_tree import File`
	`21`	`+from strictdoc.core.file_system.file_tree import File`
`22`	`22`	`from strictdoc.core.project_config import ProjectConfig`
`23`	`23`	`from strictdoc.helpers.cast import assert_cast, assert_optional_cast`
`24`	`24`	`from strictdoc.helpers.file_system import file_open_read_utf8`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`FileEntryFormat,`
`17`	`17`	`FileReference,`
`18`	`18`	`)`
`19`		`-from strictdoc.core.file_tree import File`
	`19`	`+from strictdoc.core.file_system.file_tree import File`
`20`	`20`	`from strictdoc.core.project_config import ProjectConfig`
`21`	`21`	`from strictdoc.helpers.paths import path_to_posix_path`
`22`	`22`