Merge remote-tracking branch 'upstream/main'

autoreload.py

@@ -17,7 +17,7 @@ from contextlib import suppress
 from pathlib import Path
 from shutil import get_terminal_size as term_size
 
-from watchgod import DefaultWatcher, run_process
+from watchfiles import DefaultWatcher, run_process
 
 ROOT = Path(__file__).parent
 

requirements.txt

@@ -10,7 +10,7 @@ mistune           >= 2.0.0,  < 4.0
 pymediainfo       >= 4.2.1,  < 7
 plyer             >= 1.4.3,  < 2
 sortedcontainers  >= 2.2.2,  < 3
-watchgod          >= 0.7,    < 0.8
+watchfiles        >= 0.7
 redbaron          >= 0.9.2,  < 1
 hsluv             >= 5.0.0,  < 6
 simpleaudio       >= 1.0.4,  < 2

src/backend/user_files.py

@@ -16,7 +16,7 @@ from typing import (
 )
 
 import pyotherside
-from watchgod import Change, awatch
+from watchfiles import Change, awatch
 
 from .pcn.section import Section
 from .pyotherside_events import (
@@ -146,6 +146,8 @@ class UserFile:
 						self._mtime = mtime
 
 					elif change[0] == Change.deleted:
+						if os.path.isfile(self.path):
+							continue
 						self._mtime	  = None
 						self.data		= self.default_data
 						self._need_write = self.create_missing