OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

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

remove eventual trailing '/' at the end of urls in import script (see #1453)
pull/1488/head
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[settings.default] :
settings.remotes[0] settings.remotes[0]
} }
if (!program['username']) program['username'] = netrc.machines[program['url']].login if (!program['username']) program['username'] = netrc.machines[program['url']].login
if (!program['password']) program['password'] = netrc.machines[program['url']].password if (!program['password']) program['password'] = netrc.machines[program['url']].password
} }
@ -69,6 +70,9 @@ getSettings()
process.exit(-1) process.exit(-1)
} }
removeEndSlashes(program['url'])
removeEndSlashes(program['targetUrl'])
const user = { const user = {
username: program['username'], username: program['username'],
password: program['password'] password: program['password']
@ -321,3 +325,9 @@ function isNSFW (info: any) {
return false return false
} }
function removeEndSlashes (url: string) {
while (url.endsWith('/')) {
url.slice(0, -1)
}
}