summaryrefslogtreecommitdiffstats
path: root/module/network/HTTPDownload.py
diff options
context:
space:
mode:
authorGravatar zoidberg10 <zoidberg@mujmail.cz> 2011-12-05 16:49:19 +0100
committerGravatar zoidberg10 <zoidberg@mujmail.cz> 2011-12-05 16:49:19 +0100
commitcba56c6859eace6fbcabf0690f388ceeabd8c689 (patch)
tree90f4af3832fc0814d05f39671bfc6a78bf2f0eb1 /module/network/HTTPDownload.py
parenttemp. offline status for fs (diff)
downloadpyload-cba56c6859eace6fbcabf0690f388ceeabd8c689.tar.xz
fix filesystem encoding issues on windows and synology nas
Diffstat (limited to 'module/network/HTTPDownload.py')
-rw-r--r--module/network/HTTPDownload.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/module/network/HTTPDownload.py b/module/network/HTTPDownload.py
index ec742596c..fe8075539 100644
--- a/module/network/HTTPDownload.py
+++ b/module/network/HTTPDownload.py
@@ -29,7 +29,7 @@ from HTTPChunk import ChunkInfo, HTTPChunk
from HTTPRequest import BadHeader
from module.plugins.Plugin import Abort
-from module.utils import save_join
+from module.utils import save_join, fs_encode
class HTTPDownload():
""" loads a url http + ftp """
@@ -88,7 +88,7 @@ class HTTPDownload():
return (self.arrived * 100) / self.size
def _copyChunks(self):
- init = self.info.getChunkName(0) #initial chunk name
+ init = fs_encode(self.info.getChunkName(0)) #initial chunk name
if self.info.getCount() > 1:
fo = open(init, "rb+") #first chunkfile
@@ -96,7 +96,7 @@ class HTTPDownload():
#input file
fo.seek(
self.info.getChunkRange(i - 1)[1] + 1) #seek to beginning of chunk, to get rid of overlapping chunks
- fname = "%s.chunk%d" % (self.filename, i)
+ fname = fs_encode("%s.chunk%d" % (self.filename, i))
fi = open(fname, "rb")
buf = 32 * 1024
while True: #copy in chunks, consumes less memory
@@ -116,7 +116,7 @@ class HTTPDownload():
if self.nameDisposition and self.disposition:
self.filename = save_join(dirname(self.filename), self.nameDisposition)
- move(init, self.filename)
+ move(init, fs_encode(self.filename))
self.info.remove() #remove info file
def download(self, chunks=1, resume=False):
@@ -249,7 +249,7 @@ class HTTPDownload():
for chunk in to_clean:
self.closeChunk(chunk)
self.chunks.remove(chunk)
- remove(self.info.getChunkName(chunk.id))
+ remove(fs_encode(self.info.getChunkName(chunk.id)))
#let first chunk load the rest and update the info file
init.resetRange()