forks/peertube
1
0
Fork 0
Code Releases Activity

Remove the eventual trailing '/' at the end of urls (see #1453) (#1480)

Browse source 
remove eventual trailing '/' at the end of urls in import script (see #1453)
This commit is contained in:
HesioZ 2018-12-15 01:43:04 +01:00 committed by Rigel Kent
parent 7f3d712d5e
commit ab4dbe3657
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
server/tools/peertube-import-videos.ts
View file

@ -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)
}
}