From 2f8ffaa0d0e2074b45e254184b3a1bc5434c108c Mon Sep 17 00:00:00 2001
From: david <allemang.d@gmail.com>
Date: Wed, 19 Apr 2017 15:30:44 -0400
Subject: [PATCH] Moved independent files to separate markup folder

---
 bells.py => markup/bells.py               |  0
 clock.json => markup/clock.json           |  0
 countdown.py => markup/countdown.py       |  4 ++--
 events.txt => markup/events.txt           |  0
 panel_script.py => markup/panel_script.py |  2 +-
 panel.py                                  | 10 ++++++++--
 6 files changed, 11 insertions(+), 5 deletions(-)
 rename bells.py => markup/bells.py (100%)
 rename clock.json => markup/clock.json (100%)
 rename countdown.py => markup/countdown.py (92%)
 rename events.txt => markup/events.txt (100%)
 rename panel_script.py => markup/panel_script.py (97%)

diff --git a/bells.py b/markup/bells.py
similarity index 100%
rename from bells.py
rename to markup/bells.py
diff --git a/clock.json b/markup/clock.json
similarity index 100%
rename from clock.json
rename to markup/clock.json
diff --git a/countdown.py b/markup/countdown.py
similarity index 92%
rename from countdown.py
rename to markup/countdown.py
index 41da099..7a95607 100755
--- a/countdown.py
+++ b/markup/countdown.py
@@ -34,9 +34,9 @@ __event_load = 0
 def update_events(force=False):
     global __events, __event_load
 
-    event_time = os.stat('events.txt').st_mtime_ns
+    event_time = os.stat('markup/events.txt').st_mtime_ns
     if force or __event_load != event_time:
-        with open('events.txt') as f:
+        with open('markup/events.txt') as f:
             etext = [tuple(i.strip() for i in l.split('|')) for l in f.readlines() if
                      l.strip() and not l.startswith('#')]
             __events = [Event(date, lbl) for lbl, date in etext]
diff --git a/events.txt b/markup/events.txt
similarity index 100%
rename from events.txt
rename to markup/events.txt
diff --git a/panel_script.py b/markup/panel_script.py
similarity index 97%
rename from panel_script.py
rename to markup/panel_script.py
index 5b3533c..badfc80 100644
--- a/panel_script.py
+++ b/markup/panel_script.py
@@ -2,7 +2,7 @@ from datetime import datetime
 
 import pygame
 
-from countdown import get_events
+from markup.countdown import get_events
 from panel import Panel
 from wxget import get_weather
 
diff --git a/panel.py b/panel.py
index b3397d4..c56e31d 100644
--- a/panel.py
+++ b/panel.py
@@ -1,5 +1,6 @@
 import importlib
 import json
+import os
 import re
 
 import pygame
@@ -61,6 +62,9 @@ old_modules = {}
 def load(file):
     loaded_modules = {}
 
+    fp = file
+    directory, file = os.path.split(file)
+
     def ordered_pair(s, dtype=float):
         if not s:
             return None
@@ -86,12 +90,14 @@ def load(file):
 
         mod, func = pair
 
+        mname = directory.replace('/', '.') + '.' + mod
+
         if mod not in loaded_modules:
             if mod in old_modules:
                 importlib.reload(old_modules[mod])
 
             try:
-                loaded_modules[mod] = importlib.import_module(mod)
+                loaded_modules[mod] = importlib.import_module(mname)
             except ModuleNotFoundError:
                 return None
 
@@ -120,7 +126,7 @@ def load(file):
 
         return Panel(surf, position, anchor, pivot, children, args)
 
-    with open(file) as f:
+    with open(fp) as f:
         j = json.load(f)
         if isinstance(j, list):
             ls = [from_dict(d) for d in j]