Mercurial > traipse_dev

changeset 12:c056e967907a traipse_dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
I said, 'let the users have freedom' and it was it writ in code No more stagnant directorys inside webfiles. Make your own! **webfiles is for security**
author sirebral
date Fri, 17 Jul 2009 09:03:41 -0500
parents 292e064396e4
children 3add6bbc3a56
files orpg/mapper/background_handler.py orpg/mapper/miniatures_handler.py orpg/orpg_version.py
diffstat 3 files changed, 5 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/orpg/mapper/background_handler.py	Fri Jul 17 08:34:18 2009 -0500
+++ b/orpg/mapper/background_handler.py	Fri Jul 17 09:03:41 2009 -0500
@@ -83,18 +83,12 @@
                     min_url = open_rpg.get_component("cherrypy") + filename
                 except:
                     return
-                if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep + 'Textures': 
-                    min_url = open_rpg.get_component("cherrypy") + 'Textures/' + filename
-                if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep + 'Maps': 
-                    min_url = open_rpg.get_component("cherrypy") + 'Maps/' + filename
-                if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep + 'Miniatures': 
-                    min_url = open_rpg.get_component("cherrypy") + 'Miniatures/' + filename
-                print min_url
+                min_url = dlg.GetDirectory().replace(orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep, open_rpg.get_component("cherrypy")) + '/' + filename
 
                 if self.bg_type.GetStringSelection() == 'Texture':
-                    self.canvas.layers['bg'].set_texture(str(min_url))
+                    self.canvas.layers['bg'].set_texture(min_url)
                 elif self.bg_type.GetStringSelection() == 'Image':
-                    self.size = self.canvas.layers['bg'].set_image(str(min_url),1)
+                    self.size = self.canvas.layers['bg'].set_image(min_url,1)
                 self.update_info()
                 self.canvas.send_map_data()
                 self.canvas.Refresh(False)
--- a/orpg/mapper/miniatures_handler.py	Fri Jul 17 08:34:18 2009 -0500
+++ b/orpg/mapper/miniatures_handler.py	Fri Jul 17 09:03:41 2009 -0500
@@ -165,13 +165,7 @@
                 min_url = open_rpg.get_component("cherrypy") + filename
             except:
                 return
-            if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep +' Textures': 
-                min_url = open_rpg.get_component("cherrypy") + 'Textures/' + filename
-            if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep + 'Maps': 
-                min_url = open_rpg.get_component("cherrypy") + 'Maps/' + filename
-            if dlg.GetDirectory() == orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep + 'Miniatures': 
-                min_url = open_rpg.get_component("cherrypy") + 'Miniatures/' + filename
-
+            min_url = dlg.GetDirectory().replace(orpg.dirpath.dir_struct["user"]+'webfiles' + os.sep, open_rpg.get_component("cherrypy")) + '/' + filename
             # build url
             if min_url == "" or min_url == "http://":
                 return
--- a/orpg/orpg_version.py	Fri Jul 17 08:34:18 2009 -0500
+++ b/orpg/orpg_version.py	Fri Jul 17 09:03:41 2009 -0500
@@ -4,7 +4,7 @@
 #BUILD NUMBER FORMAT: "YYMMDD-##" where ## is the incremental daily build index (if needed)
 DISTRO = "Traipse Dev"
 DIS_VER = "Grumpy Goblin"
-BUILD = "090717-02"
+BUILD = "090717-03"
 
 # This version is for network capability.
 PROTOCOL_VERSION = "1.2"