From 1516d55a880c4feb2f455286de52f93c27e29b64 Mon Sep 17 00:00:00 2001
From: radfish <redfish@galactica.pw>
Date: Tue, 16 Apr 2019 05:34:55 -0400
Subject: [PATCH] Sidebar: rename media-globe/ to media_globe/ (#1973)

So that it can be an importable package.
This is in preparation for setuptools packaging.
---
 plugins/Sidebar/SidebarPlugin.py                    |   2 +-
 .../{media-globe => media_globe}/Detector.js        |   0
 .../Sidebar/{media-globe => media_globe}/Tween.js   |   0
 plugins/Sidebar/{media-globe => media_globe}/all.js |   8 ++++----
 .../Sidebar/{media-globe => media_globe}/globe.js   |   0
 .../{media-globe => media_globe}/three.min.js       |   0
 .../Sidebar/{media-globe => media_globe}/world.jpg  | Bin
 7 files changed, 5 insertions(+), 5 deletions(-)
 rename plugins/Sidebar/{media-globe => media_globe}/Detector.js (100%)
 rename plugins/Sidebar/{media-globe => media_globe}/Tween.js (100%)
 rename plugins/Sidebar/{media-globe => media_globe}/all.js (99%)
 rename plugins/Sidebar/{media-globe => media_globe}/globe.js (100%)
 rename plugins/Sidebar/{media-globe => media_globe}/three.min.js (100%)
 rename plugins/Sidebar/{media-globe => media_globe}/world.jpg (100%)

diff --git a/plugins/Sidebar/SidebarPlugin.py b/plugins/Sidebar/SidebarPlugin.py
index ab3d00a5..5f6dd63e 100644
--- a/plugins/Sidebar/SidebarPlugin.py
+++ b/plugins/Sidebar/SidebarPlugin.py
@@ -49,7 +49,7 @@ class UiRequestPlugin(object):
                     yield part
         elif path.startswith("/uimedia/globe/"):  # Serve WebGL globe files
             file_name = re.match(".*/(.*)", path).group(1)
-            plugin_media_file = "%s-globe/%s" % (media_dir, file_name)
+            plugin_media_file = "%s_globe/%s" % (media_dir, file_name)
             if config.debug and path.endswith("all.js"):
                 # If debugging merge *.css to all.css and *.js to all.js
                 from Debug import DebugMedia
diff --git a/plugins/Sidebar/media-globe/Detector.js b/plugins/Sidebar/media_globe/Detector.js
similarity index 100%
rename from plugins/Sidebar/media-globe/Detector.js
rename to plugins/Sidebar/media_globe/Detector.js
diff --git a/plugins/Sidebar/media-globe/Tween.js b/plugins/Sidebar/media_globe/Tween.js
similarity index 100%
rename from plugins/Sidebar/media-globe/Tween.js
rename to plugins/Sidebar/media_globe/Tween.js
diff --git a/plugins/Sidebar/media-globe/all.js b/plugins/Sidebar/media_globe/all.js
similarity index 99%
rename from plugins/Sidebar/media-globe/all.js
rename to plugins/Sidebar/media_globe/all.js
index 5ddc0313..f7a9c4eb 100644
--- a/plugins/Sidebar/media-globe/all.js
+++ b/plugins/Sidebar/media_globe/all.js
@@ -1,6 +1,6 @@
 
 
-/* ---- plugins/Sidebar/media-globe/Detector.js ---- */
+/* ---- plugins/Sidebar/media_globe/Detector.js ---- */
 
 
 /**
@@ -66,7 +66,7 @@ Detector = {
 
 
 
-/* ---- plugins/Sidebar/media-globe/Tween.js ---- */
+/* ---- plugins/Sidebar/media_globe/Tween.js ---- */
 
 
 // Tween.js - http://github.com/sole/tween.js
@@ -84,7 +84,7 @@ TWEEN.Easing.Bounce.EaseInOut=function(a){if(a<0.5)return TWEEN.Easing.Bounce.Ea
 
 
 
-/* ---- plugins/Sidebar/media-globe/globe.js ---- */
+/* ---- plugins/Sidebar/media_globe/globe.js ---- */
 
 
 /**
@@ -526,7 +526,7 @@ DAT.Globe = function(container, opts) {
 
 
 
-/* ---- plugins/Sidebar/media-globe/three.min.js ---- */
+/* ---- plugins/Sidebar/media_globe/three.min.js ---- */
 
 
 // threejs.org/license
diff --git a/plugins/Sidebar/media-globe/globe.js b/plugins/Sidebar/media_globe/globe.js
similarity index 100%
rename from plugins/Sidebar/media-globe/globe.js
rename to plugins/Sidebar/media_globe/globe.js
diff --git a/plugins/Sidebar/media-globe/three.min.js b/plugins/Sidebar/media_globe/three.min.js
similarity index 100%
rename from plugins/Sidebar/media-globe/three.min.js
rename to plugins/Sidebar/media_globe/three.min.js
diff --git a/plugins/Sidebar/media-globe/world.jpg b/plugins/Sidebar/media_globe/world.jpg
similarity index 100%
rename from plugins/Sidebar/media-globe/world.jpg
rename to plugins/Sidebar/media_globe/world.jpg