diff --git a/Qalbum.py b/Qalbum.py index a1b982c..47e52ad 100755 --- a/Qalbum.py +++ b/Qalbum.py @@ -21,6 +21,7 @@ import urllib import shutil import csv import subprocess +import string from math import ceil from datetime import datetime @@ -168,7 +169,10 @@ def imagescript(path,list): times=getfiletimes(path,list) n=0 for i in list: - desc=singlequotes.sub("\\'",unicode(descriptions[n],encoding="utf8").encode('ascii', 'xmlcharrefreplace')) + try: + desc=singlequotes.sub("\\'",unicode(descriptions[n],encoding="utf8").encode('ascii', 'xmlcharrefreplace')) + except: + desc=singlequotes.sub("\\'",filter(lambda x: x in string.printable, descriptions[n]).encode('ascii', 'xmlcharrefreplace')) strout+='imagelist.push("'+unicode(i,encoding="utf8").encode('ascii', 'xmlcharrefreplace')+'");' strout+='imagedesc.push(\''+desc+'\');\n' strout+='imagetime.push('+str(times[n])+');\n' @@ -184,7 +188,11 @@ def imagelinks(path,list): n=0 for i in list: nice=nicestring(i) - desc=doublequotes.sub('',unicode(descriptions[n],encoding="utf8").encode('ascii', 'xmlcharrefreplace')) + try: + desc=doublequotes.sub('',unicode(descriptions[n],encoding="utf8").encode('ascii', 'xmlcharrefreplace')) + except: + desc=doublequotes.sub('',filter(lambda x: x in string.printable, descriptions[n]).encode('ascii', 'xmlcharrefreplace')) + strout+='
'+unicode(nice,encoding="utf8").encode('ascii', 'xmlcharrefreplace')+'
' n+=1 strout+=''