From c67aefa3eabdcc413faf933c0b2be643aaa05684 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Wed, 15 Jan 2020 09:11:20 +1000
Subject: [PATCH] move hook gen code out of anki/

It's not needed at runtime, and this allows hooks to be updated
even when the code is broken.
---
 pylib/Makefile                                 | 2 +-
 pylib/tools/__init__.py                        | 0
 pylib/tools/genhooks.py                        | 2 +-
 pylib/{anki/hooks_gen.py => tools/hookslib.py} | 0
 qt/Makefile                                    | 4 ++--
 qt/tools/{genhooks.py => genhooks_gui.py}      | 6 +++++-
 6 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 pylib/tools/__init__.py
 rename pylib/{anki/hooks_gen.py => tools/hookslib.py} (100%)
 rename qt/tools/{genhooks.py => genhooks_gui.py} (92%)

diff --git a/pylib/Makefile b/pylib/Makefile
index c9f8c1c4e..c3c72869f 100644
--- a/pylib/Makefile
+++ b/pylib/Makefile
@@ -27,7 +27,7 @@ PROTODEPS := $(wildcard ../proto/*.proto)
 	protoc --proto_path=../proto --python_out=anki --mypy_out=anki $(PROTODEPS)
 	@touch $@
 
-.build/hooks: tools/genhooks.py anki/hooks_gen.py
+.build/hooks: tools/genhooks.py tools/hookslib.py
 	python tools/genhooks.py
 	black anki/hooks.py
 	@touch $@
diff --git a/pylib/tools/__init__.py b/pylib/tools/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/pylib/tools/genhooks.py b/pylib/tools/genhooks.py
index cee64c4b4..63767d8ea 100644
--- a/pylib/tools/genhooks.py
+++ b/pylib/tools/genhooks.py
@@ -11,7 +11,7 @@ To add a new hook:
 """
 
 import os
-from anki.hooks_gen import Hook, update_file
+from hookslib import Hook, update_file
 
 # Hook/filter list
 ######################################################################
diff --git a/pylib/anki/hooks_gen.py b/pylib/tools/hookslib.py
similarity index 100%
rename from pylib/anki/hooks_gen.py
rename to pylib/tools/hookslib.py
diff --git a/qt/Makefile b/qt/Makefile
index c4ea2113e..115a95ca0 100644
--- a/qt/Makefile
+++ b/qt/Makefile
@@ -35,8 +35,8 @@ TSDEPS := $(wildcard ts/src/*.ts)
 	(cd ts && npm i && npm run build)
 	@touch $@
 
-.build/hooks: tools/genhooks.py ../pylib/anki/hooks_gen.py
-	python tools/genhooks.py
+.build/hooks: tools/genhooks_gui.py ../pylib/tools/hookslib.py
+	python tools/genhooks_gui.py
 	black aqt/gui_hooks.py
 	@touch $@
 
diff --git a/qt/tools/genhooks.py b/qt/tools/genhooks_gui.py
similarity index 92%
rename from qt/tools/genhooks.py
rename to qt/tools/genhooks_gui.py
index 24420bf22..6bdfa9d3d 100644
--- a/qt/tools/genhooks.py
+++ b/qt/tools/genhooks_gui.py
@@ -6,8 +6,12 @@ See pylib/tools/genhooks.py for more info.
 """
 
 import os
+import sys
 
-from anki.hooks_gen import Hook, update_file
+pylib = os.path.join(os.path.dirname(__file__), "..", "..", "pylib")
+sys.path.append(pylib)
+
+from tools.hookslib import Hook, update_file
 
 # Hook list
 ######################################################################