Skip to content

Commit

Permalink
Ignore folders, system and hidden files
Browse files Browse the repository at this point in the history
  • Loading branch information
Avasam committed Oct 2, 2024
1 parent c392b9f commit 0e8157d
Show file tree
Hide file tree
Showing 3 changed files with 39 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ repos:
- id: pretty-format-ini
args: [--autofix]
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.1 # Must match requirements-dev.txt
rev: v0.6.8 # Must match requirements-dev.txt
hooks:
- id: ruff
args: [--fix]
Expand Down
2 changes: 1 addition & 1 deletion scripts/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
-r requirements.txt
#
# Linters & Formatters
ruff>=0.6.1 # Pre-commit fix # Must match .pre-commit-config.yaml
ruff>=0.6.8 # Pre-commit fix # Must match .pre-commit-config.yaml
#
# Types
types-D3DShot ; sys_platform == 'win32'
Expand Down
43 changes: 37 additions & 6 deletions src/split_parser.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
import os
import sys
from collections.abc import Callable
from functools import partial
from stat import FILE_ATTRIBUTE_HIDDEN, FILE_ATTRIBUTE_SYSTEM, UF_HIDDEN

Check failure on line 5 in src/split_parser.py

View workflow job for this annotation

GitHub Actions / Pyright (ubuntu-22.04, 3.11)

"FILE_ATTRIBUTE_HIDDEN" is unknown import symbol (reportAttributeAccessIssue)

Check failure on line 5 in src/split_parser.py

View workflow job for this annotation

GitHub Actions / Pyright (ubuntu-22.04, 3.11)

Type of "FILE_ATTRIBUTE_HIDDEN" is unknown (reportUnknownVariableType)

Check failure on line 5 in src/split_parser.py

View workflow job for this annotation

GitHub Actions / Pyright (ubuntu-22.04, 3.11)

"FILE_ATTRIBUTE_SYSTEM" is unknown import symbol (reportAttributeAccessIssue)

Check failure on line 5 in src/split_parser.py

View workflow job for this annotation

GitHub Actions / Pyright (ubuntu-22.04, 3.11)

Type of "FILE_ATTRIBUTE_SYSTEM" is unknown (reportUnknownVariableType)

Check failure on line 5 in src/split_parser.py

View workflow job for this annotation

GitHub Actions / Pyright (ubuntu-22.04, 3.12)

"FILE_ATTRIBUTE_HIDDEN" is unknown import symbol (reportAttributeAccessIssue)

Check failure on line 5 in src/split_parser.py

View workflow job for this annotation

GitHub Actions / Pyright (ubuntu-22.04, 3.12)

Type of "FILE_ATTRIBUTE_HIDDEN" is unknown (reportUnknownVariableType)

Check failure on line 5 in src/split_parser.py

View workflow job for this annotation

GitHub Actions / Pyright (ubuntu-22.04, 3.12)

"FILE_ATTRIBUTE_SYSTEM" is unknown import symbol (reportAttributeAccessIssue)

Check failure on line 5 in src/split_parser.py

View workflow job for this annotation

GitHub Actions / Pyright (ubuntu-22.04, 3.12)

Type of "FILE_ATTRIBUTE_SYSTEM" is unknown (reportUnknownVariableType)
from typing import TYPE_CHECKING, TypeVar

import error_messages
from AutoSplitImage import RESET_KEYWORD, START_KEYWORD, AutoSplitImage, ImageType
from utils import is_valid_image

if TYPE_CHECKING:
from _typeshed import StrPath

from AutoSplit import AutoSplit

(
Expand Down Expand Up @@ -193,13 +197,40 @@ def validate_before_parsing(autosplit: "AutoSplit", *, show_error: bool = True):
return not error


def parse_and_validate_images(autosplit: "AutoSplit"):
# Get split images
all_images = [
AutoSplitImage(os.path.join(autosplit.settings_dict["split_image_directory"], image_name))
for image_name in os.listdir(autosplit.settings_dict["split_image_directory"])
]
def is_user_file(path: StrPath):
"""Returns False for hidden files, system files and folders."""
if os.path.isdir(path) or os.path.basename(path).startswith("."):
return False
stat_result = os.stat(path)
if stat_result.st_mode & UF_HIDDEN:
return False
if sys.platform == "win32":
return not (
(stat_result.st_file_attributes & FILE_ATTRIBUTE_SYSTEM)
| (stat_result.st_file_attributes & FILE_ATTRIBUTE_HIDDEN)
)
return True


def __get_images_from_directory(directory: StrPath):
"""
Returns a list of AutoSplitImage parsed from a directory.
Hidden files, system files and folders are silently ignored.
"""
file_paths = (
os.path.join(directory, filename) # format: skip
for filename in os.listdir(directory)
)
filtered_image_paths = (
image_path # format: skip
for image_path in file_paths
if is_user_file(image_path)
)
return [AutoSplitImage(image_path) for image_path in filtered_image_paths]


def parse_and_validate_images(autosplit: "AutoSplit"):
all_images = __get_images_from_directory(autosplit.settings_dict["split_image_directory"])
# Find non-split images and then remove them from the list
start_image = __pop_image_type(all_images, ImageType.START)
reset_image = __pop_image_type(all_images, ImageType.RESET)
Expand Down

0 comments on commit 0e8157d

Please sign in to comment.