chunker relocate and rename

Author: Fallen-Breath

prime_backup/action/helpers/blob_pre_calc_result.py

@@ -3,8 +3,8 @@
 from typing import List, IO
 
 from prime_backup.types.chunk_method import ChunkMethod
+from prime_backup.types.chunker import PrettyChunk
 from prime_backup.utils import misc_utils, hash_utils
-from prime_backup.utils.chunker import PrettyChunk
 from prime_backup.utils.hash_utils import SizeAndHash
 
 

prime_backup/types/chunk_method.py

@@ -2,24 +2,24 @@
 from pathlib import Path
 from typing import Optional, IO, TYPE_CHECKING
 
-from prime_backup.types.chunker_factory import ChunkerFactory, CDCChunkerFactory, FixedSizeChunkerFactory
-from prime_backup.utils.chunker import Chunker
+from prime_backup.types.chunker import Chunker
+from prime_backup.types.chunker_definition import ChunkerDefinition, CDCChunkerDefinition, FixedSizeChunkerDefinition
 from prime_backup.utils.path_like import PathLike
 
 
 class ChunkMethod(enum.Enum):
 	# Content-Defined Chunking (CDC)
-	cdc_32k = CDCChunkerFactory(avg_size=32 * 1024, min_size=8 * 1024, max_size=256 * 1024)
-	cdc_128k = CDCChunkerFactory(avg_size=128 * 1024, min_size=64 * 1024, max_size=1024 * 1024)
+	cdc_32k = CDCChunkerDefinition(avg_size=32 * 1024, min_size=8 * 1024, max_size=256 * 1024)
+	cdc_128k = CDCChunkerDefinition(avg_size=128 * 1024, min_size=64 * 1024, max_size=1024 * 1024)
 	cdc = cdc_32k
 
 	# Fixed-Size Chunking
-	fixed_4k = FixedSizeChunkerFactory(4 * 1024)
-	fixed_32k = FixedSizeChunkerFactory(32 * 1024)
-	fixed_128k = FixedSizeChunkerFactory(128 * 1024)
+	fixed_4k = FixedSizeChunkerDefinition(4 * 1024)
+	fixed_32k = FixedSizeChunkerDefinition(32 * 1024)
+	fixed_128k = FixedSizeChunkerDefinition(128 * 1024)
 
 	if TYPE_CHECKING:
-		value: ChunkerFactory
+		value: ChunkerDefinition
 
 	@classmethod
 	def get_for_file(cls, file_path: PathLike, file_size: int) -> Optional['ChunkMethod']:

prime_backup/utils/chunker.py prime_backup/types/chunker.pyprime_backup/utils/chunker.py renamed to prime_backup/types/chunker.py

@@ -5,10 +5,10 @@
 
 from typing_extensions import override
 
-from prime_backup.utils.chunker import Chunker, CDCFileChunker, CDCStreamChunker, FixedSizeFileChunker, FixedSizeStreamChunker, CDCChunkerConfig
+from prime_backup.types.chunker import Chunker, CDCFileChunker, CDCStreamChunker, FixedSizeFileChunker, FixedSizeStreamChunker, CDCChunkerConfig
 
 
-class ChunkerFactory(ABC):
+class ChunkerDefinition(ABC):
 	@abstractmethod
 	def create_file_chunker(self, file_path: Path, need_entire_file_hash: bool) -> Chunker:
 		...
@@ -19,7 +19,7 @@ def create_stream_chunker(self, stream, need_entire_file_hash: bool) -> Chunker:
 
 
 @dataclasses.dataclass(frozen=True)
-class CDCChunkerFactory(ChunkerFactory):
+class CDCChunkerDefinition(ChunkerDefinition):
 	avg_size: int
 	min_size: int
 	max_size: int
@@ -38,7 +38,7 @@ def create_stream_chunker(self, stream: IO[bytes], need_entire_file_hash: bool)
 
 
 @dataclasses.dataclass(frozen=True)
-class FixedSizeChunkerFactory(ChunkerFactory):
+class FixedSizeChunkerDefinition(ChunkerDefinition):
 	chunk_size: int
 
 	@override