refactoring

git-svn-id: http://mediamods.com/public-svn/camera-activity/Record.activity@785 574bc980-5f2d-0410-acbc-c8f9f0eb14e0

1 files changed, 26 insertions, 1 deletions

diff --git a/utils.py b/utils.py
index c683dc8..591c436 100644
--- a/utils.py
+++ b/utils.py
@@ -1,4 +1,6 @@
 import base64
+import rsvg
+import re
 
 
 def getStringFromPixbuf(pixbuf):
@@ -17,4 +19,27 @@ def getPixbufFromString(str):
 	data = base64.b64decode( str )
 	pbl.write(data)
 	pbl.close()
-	return pbl.get_pixbuf()
\ No newline at end of file
+	return pbl.get_pixbuf()
+
+
+def loadSvg( data, stroke, fill ):
+	if ((stroke == None) or (fill == None)):
+		return rsvg.Handle( data=data )
+
+	entity = '<!ENTITY fill_color "%s">' % fill
+	data = re.sub('<!ENTITY fill_color .*>', entity, data)
+
+	entity = '<!ENTITY stroke_color "%s">' % stroke
+	data = re.sub('<!ENTITY stroke_color .*>', entity, data)
+
+	return rsvg.Handle( data=data )
+
+
+def getUniqueFilepath( path, i ):
+	pathOb = os.path.abspath( path )
+	if (os.path.exists(pathOb)):
+		i = i+1
+		newPath = os.path.join( os.path.dirname(pathOb), str( str(i) + os.path.basename(pathOb) ) )
+		return getUniqueFilepath( str(newPath), i )
+	else:
+		return os.path.abspath( path )
\ No newline at end of file