From 5944e471c788c65efd8b410ea00b7fd61f2aaa4b Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 13 Jan 2020 12:36:26 -0500 Subject: [PATCH] use local download url that redirects to api server --- lbrytv/src/routes.js | 8 +++++++- static/app-strings.json | 5 +++-- ui/component/fileDownloadLink/view.jsx | 3 +-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lbrytv/src/routes.js b/lbrytv/src/routes.js index 50e153194..2727b592a 100644 --- a/lbrytv/src/routes.js +++ b/lbrytv/src/routes.js @@ -1,5 +1,5 @@ const { getHtml } = require('./html'); -const { generateStreamUrl } = require('../../ui/util/lbrytv'); +const { generateStreamUrl, generateDownloadUrl } = require('../../ui/util/lbrytv'); const { LBRY_TV_API } = require('../../config'); const Router = require('@koa/router'); const send = require('koa-send'); @@ -12,6 +12,12 @@ router.get(`/$/embed/:claimName/:claimId`, async ctx => { ctx.redirect(streamUrl); }); +router.get(`/$/download/:claimName/:claimId`, async ctx => { + const { claimName, claimId } = ctx.params; + const downloadUrl = generateDownloadUrl(claimName, claimId, LBRY_TV_API); + ctx.redirect(downloadUrl); +}); + router.get('*', async ctx => { const html = await getHtml(ctx); ctx.body = html; diff --git a/static/app-strings.json b/static/app-strings.json index 76bafec7a..95174d6d7 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -909,5 +909,6 @@ "Get %range% LBC": "Get %range% LBC", "Did something go wrong? Have a look in your log file, or send it to %support_link%.": "Did something go wrong? Have a look in your log file, or send it to %support_link%.", "%amount% LBC": "%amount% LBC", - "%amount% fee": "%amount% fee" -} + "%amount% fee": "%amount% fee", + "1 file hidden due to your %content_viewing_preferences_link%": "1 file hidden due to your %content_viewing_preferences_link%" +} \ No newline at end of file diff --git a/ui/component/fileDownloadLink/view.jsx b/ui/component/fileDownloadLink/view.jsx index 21a281971..20aa07dc8 100644 --- a/ui/component/fileDownloadLink/view.jsx +++ b/ui/component/fileDownloadLink/view.jsx @@ -4,7 +4,6 @@ import * as MODALS from 'constants/modal_types'; import React from 'react'; import Button from 'component/button'; import ToolTip from 'component/common/tooltip'; -import { generateDownloadUrl } from 'util/lbrytv'; type Props = { uri: string, @@ -39,7 +38,7 @@ function FileDownloadLink(props: Props) { const isPaidContent = cost > 0; const { name, claim_id: claimId, value } = claim; const fileName = value && value.source && value.source.name; - const downloadUrl = generateDownloadUrl(name, claimId, undefined, true); + const downloadUrl = `/$/download/${name}/${claimId}`; function handleDownload() { // @if TARGET='app'