mirrors/legendary
1
0
Fork 0
mirror of https://github.com/derrod/legendary.git synced 2024-12-22 01:45:28 +00:00
Code Issues Projects Releases Wiki Activity

[downloader] Fix patching games with reused chunks

Browse source
This commit is contained in:
derrod 2020-04-21 19:56:34 +02:00
parent a2197aec12
commit c9961f4435
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
legendary/downloader/manager.py
View file

@ -146,12 +146,16 @@ class DLManager(Process):
break break
continue continue
while task.chunk_guid in in_buffer: while (task.chunk_guid in in_buffer) or task.chunk_file:
res = in_buffer[task.chunk_guid] if task.chunk_file: # re-using from an old file
res_shm = None
else:
res = in_buffer[task.chunk_guid]
res_shm = res.shm
try: try:
self.writer_queue.put(WriterTask( self.writer_queue.put(WriterTask(
filename=current_file, shared_memory=res.shm, filename=current_file, shared_memory=res_shm,
chunk_offset=task.chunk_offset, chunk_size=task.chunk_size, chunk_offset=task.chunk_offset, chunk_size=task.chunk_size,
chunk_guid=task.chunk_guid, release_memory=task.cleanup, chunk_guid=task.chunk_guid, release_memory=task.cleanup,
old_file=task.chunk_file # todo on-disk cache old_file=task.chunk_file # todo on-disk cache
@ -160,7 +164,7 @@ class DLManager(Process):
self.log.warning(f'Adding to queue failed: {e!r}') self.log.warning(f'Adding to queue failed: {e!r}')
break break
if task.cleanup: if task.cleanup and not task.chunk_file:
del in_buffer[task.chunk_guid] del in_buffer[task.chunk_guid]
try: try:

4
legendary/downloader/workers.py
View file

@ -172,7 +172,7 @@ class FileWorker(Process):
continue continue
try: try:
os.rename(os.path.join(self.base_path, j.temporary_filename), full_path) os.rename(os.path.join(self.base_path, j.old_filename), full_path)
except OSError as e: except OSError as e:
self.log.error(f'Renaming file failed: {e!r}') self.log.error(f'Renaming file failed: {e!r}')
self.o_q.put(WriterTaskResult(success=False, filename=j.filename)) self.o_q.put(WriterTaskResult(success=False, filename=j.filename))
@ -212,7 +212,7 @@ class FileWorker(Process):
post_write = time.time() post_write = time.time()
elif j.old_file: elif j.old_file:
pre_write = time.time() pre_write = time.time()
with open(os.path.join(self.base_path, j.cache_file), 'rb') as f: with open(os.path.join(self.base_path, j.old_file), 'rb') as f:
if j.chunk_offset: if j.chunk_offset:
f.seek(j.chunk_offset) f.seek(j.chunk_offset)
current_file.write(f.read(j.chunk_size)) current_file.write(f.read(j.chunk_size))