traipse_dev: orpg/mapper/images.py annotate

annotate orpg/mapper/images.py @ 100:7ed4979cc1cf beta

Traipse Beta 'OpenRPG' {090925-00} Traipse is a distribution of OpenRPG that is designed to be easy to setup and go. Traipse also makes it easy for developers to work on code without fear of sacrifice. 'Ornery-Orc' continues the trend of 'Grumpy' and adds fixes to the code. 'Ornery-Orc''s main goal is to offer more advanced features and enhance the productivity of the user. Update Summary: 090925-00: Adds menu changes to draw attention to important updates, errors, or other events. (image info coming soon) Traipse URL is not included in the repos tab and is set as default. Fixes Copy for Windows and Linux (finally!!) users. Fixes incomplete update to Grid and List nodes. Fixes incomplete update to Chat Commands. Fixes problems with Remote Image Upload. Fixes Drop and Drag of Minis to Map. CherryPy can now use any image in the webfiles/ folder and sub-folders. CherryPy can now Drop and Drag Minis to the Map. Minor changes to Update Manager's GUI. Expert recommendation warning added to Revision Update. Step down compatibility with open_rpg & component added to orpgCore. Fixes CherryPit misspelling. Makes Traipse Suite 'Attention' item portable, and executes it on 'Critical' debug notices. Adds incomplete Shift + Enter to Text Entry, currently creates a 'Critical' warning. New default Lobby Map, designed for Traipse. Feel free to change it. Updates to Server GUI: * Admin can Ban from Backend. * Admin can Modify Ban List and Un Ban users. * Server GUI finds your Lobby Name * New users default as Lurker unless a Role is set Cleaner TraipseSuiteAttention portability and clean up in Main. Die Roll Commands addition from Core code allowing Math Ordering with ()'s New About Dialog. A more uniform About Dialog. Corrects image loading of duplicate images.

author	sirebral
date	Fri, 25 Sep 2009 20:46:02 -0500
parents	68c7bd272f27
children	61fc775862f7 dcf4fbe09b70

rev	line source
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	1 # Copyright (C) 2000-2001 The OpenRPG Project
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	2 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	3 # openrpg-dev@lists.sourceforge.net
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	4 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	5 # This program is free software; you can redistribute it and/or modify
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	6 # it under the terms of the GNU General Public License as published by
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	7 # the Free Software Foundation; either version 2 of the License, or
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	8 # (at your option) any later version.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	9 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	10 # This program is distributed in the hope that it will be useful,
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	11 # but WITHOUT ANY WARRANTY; without even the implied warranty of
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	13 # GNU General Public License for more details.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	14 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	15 # You should have received a copy of the GNU General Public License
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	16 # along with this program; if not, write to the Free Software
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	17 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	18 # --
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	19 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	20 # File: mapper/images.py
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	21 # Author: OpenRPG
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	22 # Maintainer:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	23 # Version:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	24 # $Id: images.py,v 1.21 2007/12/11 04:07:15 digitalxero Exp $
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	25 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	26 # Description:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	27 #
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	28 __version__ = "$Id: images.py,v 1.21 2007/12/11 04:07:15 digitalxero Exp $"
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	29
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	30 import urllib
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	31 import Queue
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	32 import thread
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	33 from threading import Lock
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	34 import time
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	35
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	36 from orpg.orpg_wx import *
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	37 from orpg.orpgCore import component
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 22 diff changeset	38 from orpg.dirpath import dir_struct
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	39 from orpg.tools.orpg_log import logger
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	40
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	41 def singleton(cls):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	42 instances = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	43 def getinstance():
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	44 if cls not in instances:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	45 instances[cls] = cls()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	46 return instances[cls]
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	47 return getinstance()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	48
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	49 class ImageHandlerClass(object):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	50 __cache = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	51 __fetching = {}
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	52 __queue = Queue.Queue(0)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	53 __lock = Lock()
76 37a11fea3304 More clean up. Images now posts a Chat Info post if image doesn't load. sirebral parents: 71 diff changeset	54 chat = component.get("chat")
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	55
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	56 def load(self, path, image_type, imageId):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	57 """Load an image, with a intermideary fetching image shown while it loads in a background thread"""
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	58 if self.__cache.has_key(path): return wx.ImageFromMime(self.__cache[path][1],
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	59 self.__cache[path][2]).ConvertToBitmap()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	60 if not self.__fetching.has_key(path):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	61 self.__fetching[path] = True
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	62 """Start Image Loading Thread"""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	63 thread.start_new_thread(self.__loadThread, (path, image_type, imageId))
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	64 else:
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	65 if self.__fetching[path] is True: thread.start_new_thread(self.__loadCacheThread, (path, image_type, imageId))
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 22 diff changeset	66 return wx.Bitmap(dir_struct["icon"] + "fetching.png", wx.BITMAP_TYPE_PNG)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	67
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	68 def directLoad(self, path):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	69 """Directly load an image, no threads"""
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	70 if self.__cache.has_key(path): return wx.ImageFromMime(self.__cache[path][1],
072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	71 self.__cache[path][2]).ConvertToBitmap()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	72 uriPath = urllib.unquote(path)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	73 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	74 d = urllib.urlretrieve(uriPath)
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	75 """We have to make sure that not only did we fetch something, but that
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	76 it was an image that we got back."""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	77 if d[0] and d[1].getmaintype() == "image":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	78 self.__cache[path] = (path, d[0], d[1].gettype(), None)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	79 return wx.ImageFromMime(self.__cache[path][1], self.__cache[path][2]).ConvertToBitmap()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	80 else:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	81 logger.exception(str("Image refused to load or URI did not reference a valid image: " + path), True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	82 return None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	83 except IOError:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	84 logger.exception(str("Unable to resolve/open the specified URI; image was NOT loaded: " + path), True)
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	85 return None
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	86
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	87 def cleanCache(self):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	88 """Shrinks the Cache down to the proper size"""
66 c54768cffbd4 Traipse Dev 'OpenRPG' {090818-00} sirebral parents: 22 diff changeset	89 try: cacheSize = int(component.get('settings').get_setting("ImageCacheSize"))
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	90 except: cacheSize = 32
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	91 cache = self.__cache.keys()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	92 cache.sort()
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	93 for key in cache[cacheSize:]: del self.__cache[key]
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	94
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	95 def flushCache(self):
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	96 """This function will flush all images contained within the image cache."""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	97 self.__lock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	98 try:
92 68c7bd272f27 Traipse Beta 'OpenRPG' {090919-00} sirebral parents: 77 diff changeset	99 self.__cache = {}
68c7bd272f27 Traipse Beta 'OpenRPG' {090919-00} sirebral parents: 77 diff changeset	100 self.__fetching = {}
68c7bd272f27 Traipse Beta 'OpenRPG' {090919-00} sirebral parents: 77 diff changeset	101 finally:
68c7bd272f27 Traipse Beta 'OpenRPG' {090919-00} sirebral parents: 77 diff changeset	102 self.__lock.release()
68c7bd272f27 Traipse Beta 'OpenRPG' {090919-00} sirebral parents: 77 diff changeset	103 urllib.urlcleanup()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	104
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	105 """Private Methods"""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	106 def __loadThread(self, path, image_type, imageId):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	107 uriPath = urllib.unquote(path)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	108 self.__lock.acquire()
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	109 try:
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	110 d = urllib.urlretrieve(uriPath)
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	111 """We have to make sure that not only did we fetch something, but that
449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	112 it was an image that we got back."""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	113 if d[0] and d[1].getmaintype() == "image":
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	114 self.__cache[path] = (path, d[0], d[1].gettype(), imageId)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	115 self.__queue.put((self.__cache[path], image_type, imageId))
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	116 if self.__fetching.has_key(path): del self.__fetching[path]
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	117 else:
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	118 logger.exception(str("Image refused to load or URI did not reference a valid image: " + path), True)
15 cab94a90f9dc Added 1.8.0 fix to log. Fixed problem with images that do not load the first sirebral parents: 3 diff changeset	119 del self.__fetching[path]
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	120 except IOError:
15 cab94a90f9dc Added 1.8.0 fix to log. Fixed problem with images that do not load the first sirebral parents: 3 diff changeset	121 del self.__fetching[path]
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	122 logger.exception(str("Unable to resolve/open the specified URI; image was NOT loaded: " + path), True)
20 072ffc1d466f 2nd attempt. Still untested. sirebral parents: 19 diff changeset	123 finally: self.__lock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	124
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	125 def __loadCacheThread(self, path, image_type, imageId):
100 7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	126 try:
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	127 st = time.time()
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	128 while self.__fetching.has_key(path) and self.__fetching[path] is not False:
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	129 time.sleep(0.025)
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	130 if (time.time()-st) > 120:
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	131 logger.general("Timeout: " + path)
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	132 break
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	133 except:
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	134 del self.__fetching[path]
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	135 logger.exception(str("Unable to resolve/open the specified URI; image was NOT loaded: " + path), True)
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	136 return
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	137 self.__lock.acquire()
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	138 try:
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	139 logger.info("Adding Image to Queue from Cache: " + str(self.__cache[path]), True)
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	140 self.__queue.put((self.__cache[path], image_type, imageId))
7ed4979cc1cf Traipse Beta 'OpenRPG' {090925-00} sirebral parents: 92 diff changeset	141 finally: self.__lock.release()
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	142
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	143 """Property Methods"""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	144 def _getCache(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	145 return self.__cache
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	146
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	147 def _getQueue(self):
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	148 return self.__queue
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	149
71 449a8900f9ac Code refining almost completed, for this round. Some included files are still in need of some clean up, but this is test worthy. sirebral parents: 66 diff changeset	150 """Properties"""
0 4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	151 Cache = property(_getCache)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	152 Queue = property(_getQueue)
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	153
4385a7d0efd1 Deleted and repushed it with the 'grumpy-goblin' branch. I forgot a y sirebral parents: diff changeset	154 ImageHandler = singleton(ImageHandlerClass)
92 68c7bd272f27 Traipse Beta 'OpenRPG' {090919-00} sirebral parents: 77 diff changeset	155 component.add('ImageHandler', ImageHandler)

Mercurial > traipse_dev

annotate orpg/mapper/images.py @ 100:7ed4979cc1cf beta