Skip to content

Commit

Permalink
fix walker type hints
Browse files Browse the repository at this point in the history
  • Loading branch information
tfeldmann committed Jan 12, 2024
1 parent 9d57e39 commit 4d39917
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions organize/walker.py
@@ -1,12 +1,12 @@
import os
from fnmatch import fnmatch
from typing import Iterable, Iterator, List, Literal, NamedTuple, Optional
from typing import Iterable, Iterator, List, Literal, NamedTuple, Optional, Set

from pydantic import Field
from pydantic.dataclasses import dataclass


def pattern_match(name, patterns):
def pattern_match(name: str, patterns: Iterable[str]) -> bool:
return any(fnmatch(name, pat) for pat in patterns)


Expand All @@ -15,7 +15,7 @@ class ScandirResult(NamedTuple):
nondirs: List[os.DirEntry]


def scandir(top: str, collectfiles: bool = True):
def scandir(top: str, collectfiles: bool = True) -> ScandirResult:
result = ScandirResult([], [])
try:
# build iterator if we have the permissions to this folder
Expand Down Expand Up @@ -66,10 +66,10 @@ class Walker:
method: Literal["breadth", "depth"] = "breadth"
filter_dirs: Optional[List[str]] = None
filter_files: Optional[List[str]] = None
exclude_dirs: List[str] = Field(default_factory=set)
exclude_files: List[str] = Field(default_factory=set)
exclude_dirs: Set[str] = Field(default_factory=set)
exclude_files: Set[str] = Field(default_factory=set)

def _should_yield_file(self, entry: os.DirEntry, lvl: int):
def _should_yield_file(self, entry: os.DirEntry, lvl: int) -> bool:
return (
lvl >= self.min_depth
and not pattern_match(entry.name, self.exclude_files)
Expand Down

0 comments on commit 4d39917

Please sign in to comment.