diff --git a/server/tools/peertube-import-videos.ts b/server/tools/peertube-import-videos.ts index 1fe0a9348..2874a2131 100644 --- a/server/tools/peertube-import-videos.ts +++ b/server/tools/peertube-import-videos.ts @@ -58,6 +58,7 @@ getSettings() settings.remotes[settings.default] : settings.remotes[0] } + if (!program['username']) program['username'] = netrc.machines[program['url']].login if (!program['password']) program['password'] = netrc.machines[program['url']].password } @@ -69,6 +70,9 @@ getSettings() process.exit(-1) } + removeEndSlashes(program['url']) + removeEndSlashes(program['targetUrl']) + const user = { username: program['username'], password: program['password'] @@ -321,3 +325,9 @@ function isNSFW (info: any) { return false } + +function removeEndSlashes (url: string) { + while (url.endsWith('/')) { + url.slice(0, -1) + } +}