From: Greg Hewgill <greg@hewgill.com>
Date: Thu, 8 Jan 2009 18:28:50 +0000 (+1300)
Subject: handle path separators in userpic keywords
X-Git-Tag: ljdump-1.3.2~1
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=a9e88c43e772b4781bed71acf046c5c2019dc1a4;p=oss%2Fljdump.git

handle path separators in userpic keywords
---

diff --git a/ChangeLog b/ChangeLog
index 32daf7f..5cfd73d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 ChangeLog - ljdump
 
+Version 1.3.2 - 2009-01-09
+
+- Bugfix: Handle case where userpic keywords contain a / or \.
+
 Version 1.3.1 - 2009-01-08
 
 - Feature: Download and save userpic images
diff --git a/ljdump.py b/ljdump.py
index 0ab61ec..d1e9287 100755
--- a/ljdump.py
+++ b/ljdump.py
@@ -284,12 +284,13 @@ for p in userpics:
     print >>f, """<userpic keyword="%s" url="%s" />""" % (p, userpics[p])
     pic = urllib2.urlopen(userpics[p])
     ext = MimeExtensions.get(pic.info()["Content-Type"], "")
+    picfn = re.sub(r"[\/]", "_", p)
     try:
-        picfn = codecs.utf_8_decode(p)[0]
+        picfn = codecs.utf_8_decode(picfn)[0]
         picf = open("%s/%s%s" % (Username, picfn, ext), "wb")
     except:
         # for installations where the above utf_8_decode doesn't work
-        picfn = "".join([ord(x) < 128 and x or "?" for x in p])
+        picfn = "".join([ord(x) < 128 and x or "?" for x in picfn])
         picf = open("%s/%s%s" % (Username, picfn, ext), "wb")
     shutil.copyfileobj(pic, picf)
     pic.close()