some adhoc fixes for difficult strings
This commit is contained in:
@@ -21,6 +21,7 @@ import urllib
|
|||||||
import shutil
|
import shutil
|
||||||
import csv
|
import csv
|
||||||
import subprocess
|
import subprocess
|
||||||
|
import string
|
||||||
from math import ceil
|
from math import ceil
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
@@ -168,7 +169,10 @@ def imagescript(path,list):
|
|||||||
times=getfiletimes(path,list)
|
times=getfiletimes(path,list)
|
||||||
n=0
|
n=0
|
||||||
for i in list:
|
for i in list:
|
||||||
|
try:
|
||||||
desc=singlequotes.sub("\\'",unicode(descriptions[n],encoding="utf8").encode('ascii', 'xmlcharrefreplace'))
|
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+='imagelist.push("'+unicode(i,encoding="utf8").encode('ascii', 'xmlcharrefreplace')+'");'
|
||||||
strout+='imagedesc.push(\''+desc+'\');\n'
|
strout+='imagedesc.push(\''+desc+'\');\n'
|
||||||
strout+='imagetime.push('+str(times[n])+');\n'
|
strout+='imagetime.push('+str(times[n])+');\n'
|
||||||
@@ -184,7 +188,11 @@ def imagelinks(path,list):
|
|||||||
n=0
|
n=0
|
||||||
for i in list:
|
for i in list:
|
||||||
nice=nicestring(i)
|
nice=nicestring(i)
|
||||||
|
try:
|
||||||
desc=doublequotes.sub('',unicode(descriptions[n],encoding="utf8").encode('ascii', 'xmlcharrefreplace'))
|
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+='<span class="imagebox thumbbox" id="n'+str(n)+'"><a href="'+urllib.quote(i)+'"><img class="thumbimage" "title="'+desc+'" src="_tn/tn_'+urllib.quote(i)+'.jpg"><br/>'+unicode(nice,encoding="utf8").encode('ascii', 'xmlcharrefreplace')+'</a></span>'
|
strout+='<span class="imagebox thumbbox" id="n'+str(n)+'"><a href="'+urllib.quote(i)+'"><img class="thumbimage" "title="'+desc+'" src="_tn/tn_'+urllib.quote(i)+'.jpg"><br/>'+unicode(nice,encoding="utf8").encode('ascii', 'xmlcharrefreplace')+'</a></span>'
|
||||||
n+=1
|
n+=1
|
||||||
strout+='</noscript></div>'
|
strout+='</noscript></div>'
|
||||||
|
|||||||
Reference in New Issue
Block a user