diff options
Diffstat (limited to 'youtube_dlc/postprocessor/movefilesafterdownload.py')
| -rw-r--r-- | youtube_dlc/postprocessor/movefilesafterdownload.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/youtube_dlc/postprocessor/movefilesafterdownload.py b/youtube_dlc/postprocessor/movefilesafterdownload.py index 3f7f529a9..4146a9549 100644 --- a/youtube_dlc/postprocessor/movefilesafterdownload.py +++ b/youtube_dlc/postprocessor/movefilesafterdownload.py @@ -22,17 +22,18 @@ class MoveFilesAfterDownloadPP(PostProcessor): return 'MoveFiles' def run(self, info): - if info.get('__dl_filename') is None: - return [], info - self.files_to_move.setdefault(info['__dl_filename'], '') - outdir = os.path.dirname(os.path.abspath(encodeFilename(info['__final_filename']))) + dl_path, dl_name = os.path.split(encodeFilename(info['filepath'])) + finaldir = info.get('__finaldir', dl_path) + finalpath = os.path.join(finaldir, dl_name) + self.files_to_move[info['filepath']] = finalpath for oldfile, newfile in self.files_to_move.items(): if not os.path.exists(encodeFilename(oldfile)): self.report_warning('File "%s" cannot be found' % oldfile) continue if not newfile: - newfile = compat_str(os.path.join(outdir, os.path.basename(encodeFilename(oldfile)))) + newfile = os.path.join(finaldir, os.path.basename(encodeFilename(oldfile))) + oldfile, newfile = compat_str(oldfile), compat_str(newfile) if os.path.abspath(encodeFilename(oldfile)) == os.path.abspath(encodeFilename(newfile)): continue if os.path.exists(encodeFilename(newfile)): @@ -48,5 +49,5 @@ class MoveFilesAfterDownloadPP(PostProcessor): self.to_screen('Moving file "%s" to "%s"' % (oldfile, newfile)) shutil.move(oldfile, newfile) # os.rename cannot move between volumes - info['filepath'] = info['__final_filename'] + info['filepath'] = compat_str(finalpath) return [], info |