From 81d5d00850b5a1096421e9001da20fa564f0156f Mon Sep 17 00:00:00 2001 From: Daniel Bornkessel Date: Wed, 2 Jan 2013 00:49:54 +0100 Subject: Remove '/' from filename to avoid filepath exception When a http url has a filename set to something that contains a '/', pyload will error out when trying to merge the chunks as it sees the '/' as part of the path. Example: HTTP Header contains: filename=55/filename.img Chunks are saved as: /55filename.img.chunk0 /55filename.img.chunk1 Exception on merge will complain: Error: file does not exist: /55/ as it thinks '55/' is a subdir --- module/network/HTTPChunk.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'module/network/HTTPChunk.py') diff --git a/module/network/HTTPChunk.py b/module/network/HTTPChunk.py index d17177ee7..84a2acc5f 100644 --- a/module/network/HTTPChunk.py +++ b/module/network/HTTPChunk.py @@ -263,7 +263,7 @@ class HTTPChunk(HTTPRequest): m = search("filename(?P=|\*=(?P.+)'')(?P.*)", line) if m: - name = remove_chars(m.groupdict()['name'], "\"';").strip() + name = remove_chars(m.groupdict()['name'], "\"';/").strip() self.p._name = name self.log.debug("Content-Disposition: %s" % name) @@ -295,4 +295,4 @@ class HTTPChunk(HTTPRequest): """ closes everything, unusable after this """ if self.fp: self.fp.close() self.c.close() - if hasattr(self, "p"): del self.p \ No newline at end of file + if hasattr(self, "p"): del self.p -- cgit v1.2.3