From 58c7e3246abc4b0c5e549181a0a90a4e53900811 Mon Sep 17 00:00:00 2001
From: evilchili <evilchili@gmail.com>
Date: Wed, 21 Dec 2022 22:42:36 -0800
Subject: [PATCH] move root inside importable package space

---
 groove/path.py                                                 | 3 +--
 {static => groove/static/static}/player.js                     | 0
 {themes => groove/static/themes}/blue_train/README.md          | 0
 {themes => groove/static/themes}/blue_train/console.cfg        | 0
 {themes => groove/static/themes}/blue_train/static/styles.css  | 0
 .../static/themes}/blue_train/templates/playlist.tpl           | 0
 6 files changed, 1 insertion(+), 2 deletions(-)
 rename {static => groove/static/static}/player.js (100%)
 rename {themes => groove/static/themes}/blue_train/README.md (100%)
 rename {themes => groove/static/themes}/blue_train/console.cfg (100%)
 rename {themes => groove/static/themes}/blue_train/static/styles.css (100%)
 rename {themes => groove/static/themes}/blue_train/templates/playlist.tpl (100%)

diff --git a/groove/path.py b/groove/path.py
index 06eeccc..e381662 100644
--- a/groove/path.py
+++ b/groove/path.py
@@ -9,8 +9,7 @@ _reinstall_hint = "You might need to reinstall Groove On Demand to fix this erro
 
 
 def root():
-    devroot = os.environ.get('GROOVE_ON_DEMAND_DEVROOT', None)
-    path = (Path(devroot) if devroot else Path(__file__).parent).expanduser().absolute()
+    path = Path(__file__).parent.expanduser().absolute() / Path('static')
     logging.debug(f"Root is {path}")
     return Path(path)
 
diff --git a/static/player.js b/groove/static/static/player.js
similarity index 100%
rename from static/player.js
rename to groove/static/static/player.js
diff --git a/themes/blue_train/README.md b/groove/static/themes/blue_train/README.md
similarity index 100%
rename from themes/blue_train/README.md
rename to groove/static/themes/blue_train/README.md
diff --git a/themes/blue_train/console.cfg b/groove/static/themes/blue_train/console.cfg
similarity index 100%
rename from themes/blue_train/console.cfg
rename to groove/static/themes/blue_train/console.cfg
diff --git a/themes/blue_train/static/styles.css b/groove/static/themes/blue_train/static/styles.css
similarity index 100%
rename from themes/blue_train/static/styles.css
rename to groove/static/themes/blue_train/static/styles.css
diff --git a/themes/blue_train/templates/playlist.tpl b/groove/static/themes/blue_train/templates/playlist.tpl
similarity index 100%
rename from themes/blue_train/templates/playlist.tpl
rename to groove/static/themes/blue_train/templates/playlist.tpl