File watcher and matplotlib bugfix

howroyd · howroyd · commit d594b1b7184b · 2024-06-29T19:31:39.000+01:00
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,128 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, religion, or sexual identity
+and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the
+  overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at
+https://www.twitch.tv/drgreengiant.
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series
+of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or
+permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior,  harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within
+the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.0, available at
+https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct
+enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at
+https://www.contributor-covenant.org/translations.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -0,0 +1,7 @@
+# Contributing
+
+This file is very much TODO.  If you'd like to contribute in any way and are unsure, use the discussion tab.
+
+EVERYONE is welcome to contribute!
+
+I shall, of course, update this guide in the near future.
diff --git a/README.md b/README.md
@@ -15,5 +15,5 @@
 To build the exe run:
 
 ```shell
-pyinstaller -n statsaphobia.exe --onefile run.py
+python build.py
 ```
diff --git a/assets/icon.png b/assets/icon.png
diff --git a/build.py b/build.py
@@ -0,0 +1,46 @@
+#!./.venv/bin/python3
+import importlib.metadata
+import pathlib
+import platform
+
+import PyInstaller.__main__ as pyinstaller
+
+VERSION = importlib.metadata.version("statsaphobia")
+DIRPATH = pathlib.Path().absolute()
+ENTRYPOINT = f'{DIRPATH / "run.py"}'
+SEPARATOR = ";" if platform.platform().startswith("Windows") else ":"
+NAME = f"statsaphobia-{VERSION.replace('.', '_')}"
+
+DATAFILES = [
+    f'{DIRPATH / "README.md"}{SEPARATOR}.',
+    f'{DIRPATH / "LICENSE"}{SEPARATOR}.',
+    f'{DIRPATH / "CONTRIBUTING.md"}{SEPARATOR}.',
+    f'{DIRPATH / "CODE_OF_CONDUCT.md"}{SEPARATOR}.',
+]
+
+ICON = f'{DIRPATH / "assets" / "icon.png"}'
+
+
+def build():
+    add_data = (("--add-data", item) for item in DATAFILES)
+    add_data = [item for tup in add_data for item in tup]
+
+    pyinstaller.run(
+        [
+            ENTRYPOINT,
+            # '--clean',
+            "-n",
+            NAME,
+            "--onefile",
+            "--noconfirm",
+            "--log-level",
+            "WARN",
+            *add_data,
+            "-i",
+            ICON,
+        ]
+    )
+
+
+if __name__ == "__main__":
+    build()
diff --git a/pyproject.toml b/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "statsaphobia"
-version = "0.0.0"
+version = "0.0.1"
 requires-python = ">=3.12"
 authors = [
     { name = "Simon Howroyd", email = "drgreengiant-github@port87.com" },
diff --git a/src/statsaphobia/main.py b/src/statsaphobia/main.py
@@ -64,7 +64,7 @@ def on_change() -> None:
         if oldfile:
             diff.print_diff(oldfile, jsonfile)
         html.do_html(jsonfile, outdir)
-        graphfiles: dict[str, pathlib.Path] = plot.do_plot(jsonfile, outdir / "graphs")
+        plot.do_plot(jsonfile, outdir / "graphs")
         oldfile = jsonfile
 
     on_change()
diff --git a/src/statsaphobia/phasmophobia/plot.py b/src/statsaphobia/phasmophobia/plot.py
@@ -1,6 +1,9 @@
 import json
 import pathlib
 
+import matplotlib as mpl
+
+mpl.use("Agg")  # Stops matplotlib using an x server, I think
 import matplotlib.pyplot as plt
 
 
@@ -95,10 +98,12 @@ def plot_common_ghosts(data: dict, outdir: pathlib.Path) -> pathlib.Path:
     return outdir / "common_ghosts.png"
 
 
-def do_plot(infile: pathlib.Path, outdir: pathlib.Path) -> pathlib.Path:
+def do_plot(infile: pathlib.Path, outdir: pathlib.Path) -> dict[str, pathlib.Path]:
     outdir.mkdir(parents=True, exist_ok=True)
 
     data: dict = json.loads(infile.read_text())
 
-    played_maps: pathlib.Path = plot_played_maps(data, outdir)
-    common_ghosts: pathlib.Path = plot_common_ghosts(data, outdir)
+    return {
+        "played_maps": plot_played_maps(data, outdir),
+        "common_ghosts": plot_common_ghosts(data, outdir),
+    }
diff --git a/src/statsaphobia/watcher.py b/src/statsaphobia/watcher.py
@@ -19,10 +19,8 @@ class FileWatcher:
     def __init__(self, eventhandler: Callable, path: pathlib.Path) -> None:
         self.eventhandler = eventhandler
         self.path = path
-        self.event = Event(eventhandler, path.parent)
+        self.event = Event(eventhandler)
         self.thread = threading.Thread(target=self._thread)
-        self.observer = Observer()
-        self.observer.schedule(self.event, str(self.path.parent))
         self.kill_event = threading.Event()
 
     def __enter__(self):
@@ -34,8 +32,10 @@ def __exit__(self, exc_type, exc_value, traceback):
         self.thread.join()
 
     def _thread(self):
-        self.observer.start()
+        observer = Observer()
+        observer.schedule(self.event, self.path.parent)
+        observer.start()
         print(f"Watching {self.path}")
         self.kill_event.wait()
-        self.observer.stop()
-        self.observer.join()
+        observer.stop()
+        observer.join()
