diff --git a/src/libprs500/__init__.py b/src/libprs500/__init__.py index 4b3d80dbdc..a8c3affdf0 100644 --- a/src/libprs500/__init__.py +++ b/src/libprs500/__init__.py @@ -160,4 +160,4 @@ def sanitize_file_name(name): Also remove path separators. ALl illegal characters are replaced by underscores. ''' - return re.sub(r'[:\?\\\/]|^-', '_', name.strip()) \ No newline at end of file + return re.sub(r'[\|\~\:\?\\\/]|^-', '_', name.strip()) \ No newline at end of file diff --git a/src/libprs500/web/fetch/simple.py b/src/libprs500/web/fetch/simple.py index bbbb052aca..6f9158dfd2 100644 --- a/src/libprs500/web/fetch/simple.py +++ b/src/libprs500/web/fetch/simple.py @@ -20,7 +20,8 @@ from urllib import url2pathname from httplib import responses from optparse import OptionParser -from libprs500 import __version__, __appname__, __author__, setup_cli_handlers, browser +from libprs500 import __version__, __appname__, __author__, setup_cli_handlers, \ + browser, sanitize_file_name from libprs500.ebooks.BeautifulSoup import BeautifulSoup class FetchError(Exception): @@ -191,7 +192,7 @@ class RecursiveFetcher(object): self.logger.debug('Error: %s', str(err), exc_info=True) continue c += 1 - imgpath = os.path.join(diskpath, 'img'+str(c)+ext) + imgpath = os.path.join(diskpath, sanitize_file_name('img'+str(c)+ext)) self.imagemap[iurl] = imgpath open(imgpath, 'wb').write(f.read()) tag['src'] = imgpath