Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Manage watchfiles settings #10

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ default_language_version:

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.1.0
rev: v4.3.0
hooks:
- id: check-added-large-files
- id: check-case-conflict
Expand All @@ -14,24 +14,24 @@ repos:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/pre-commit/mirrors-prettier
rev: v2.6.0
rev: v3.0.0-alpha.0
hooks:
- id: prettier
types_or:
- css
- repo: https://github.com/standard/standard
rev: v17.0.0-2
rev: v17.0.0
hooks:
- id: standard
args:
- --env=browser
- repo: https://github.com/asottile/pyupgrade
rev: v2.31.1
rev: v2.37.3
hooks:
- id: pyupgrade
args: [--py37-plus]
- repo: https://github.com/psf/black
rev: 22.1.0
rev: 22.8.0
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated pre-commit hooks since black 22.1.0 was broken

hooks:
- id: black
- repo: https://github.com/asottile/blacken-docs
Expand All @@ -45,7 +45,7 @@ repos:
hooks:
- id: isort
- repo: https://github.com/PyCQA/flake8
rev: 4.0.1
rev: 5.0.4
hooks:
- id: flake8
additional_dependencies:
Expand All @@ -59,6 +59,6 @@ repos:
- id: check-manifest
args: [--no-build-isolation]
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.941
rev: v0.971
hooks:
- id: mypy
29 changes: 24 additions & 5 deletions src/django_watchfiles/__init__.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
from __future__ import annotations

from collections.abc import Callable, Generator
from pathlib import Path
from typing import Generator
from typing import Any

import watchfiles
from django.conf import settings
from django.utils import autoreload
from django.utils.autoreload import run_with_reloader
from django.utils.module_loading import import_string


class WatchfilesReloader(autoreload.BaseReloader):
def __init__(self, watchfiles_settings: dict[str, Any]) -> None:
super().__init__()
self.watchfiles_settings = watchfiles_settings

def watched_roots(self, watched_files: list[Path]) -> frozenset[Path]:
extra_directories = self.directory_globs.keys()
watched_file_dirs = {f.parent for f in watched_files}
Expand All @@ -17,15 +25,26 @@ def watched_roots(self, watched_files: list[Path]) -> frozenset[Path]:
def tick(self) -> Generator[None, None, None]:
watched_files = list(self.watched_files(include_globs=False))
roots = autoreload.common_roots(self.watched_roots(watched_files))
watcher = watchfiles.watch(*roots, debug=True)
watcher = watchfiles.watch(*roots, **self.watchfiles_settings)
for file_changes in watcher:
for _change, path in file_changes:
self.notify_file_changed(Path(path))
yield


def replaced_get_reloader() -> autoreload.BaseReloader:
return WatchfilesReloader()
def replaced_run_with_reloader(
main_func: Callable[..., Any], *args: Any, **kwargs: Any
) -> None:
watchfiles_settings = getattr(settings, "WATCHFILES", {})
if "watch_filter" in watchfiles_settings:
watchfiles_settings["watch_filter"] = import_string(
watchfiles_settings["watch_filter"]
)()
if "debug" not in watchfiles_settings:
watchfiles_settings["debug"] = kwargs["verbosity"] > 1

autoreload.get_reloader = lambda: WatchfilesReloader(watchfiles_settings)
return run_with_reloader(main_func, *args, **kwargs)


autoreload.get_reloader = replaced_get_reloader
autoreload.run_with_reloader = replaced_run_with_reloader