v0.1/code-improvements #53
|
@ -6,13 +6,15 @@ import Video from "@/components/Pages/Video";
|
||||||
|
|
||||||
import { fetchVideoData } from "@/utils/scrape/video";
|
import { fetchVideoData } from "@/utils/scrape/video";
|
||||||
|
|
||||||
|
import { decodeVideoUrlPath } from '@/utils/string';
|
||||||
|
|
||||||
import { useLocale } from 'next-intl';
|
import { useLocale } from 'next-intl';
|
||||||
|
|
||||||
export default async function VideoPage({ params }: { params: { id: string } }) {
|
export default async function VideoPage({ params }: { params: { id: string } }) {
|
||||||
|
|
||||||
const locale = useLocale()
|
const locale = useLocale()
|
||||||
|
|
||||||
const decodedId = decodeURIComponent(params.id)
|
const decodedId = decodeVideoUrlPath(params.id)
|
||||||
|
|
||||||
const [data, related] = await fetchVideoData(decodedId)
|
const [data, related] = await fetchVideoData(decodedId)
|
||||||
|
|
||||||
|
|
|
@ -9,6 +9,7 @@ import classNames from 'classnames';
|
||||||
import Link from 'next/link'
|
import Link from 'next/link'
|
||||||
|
|
||||||
import style from './Thumbnail.module.scss'
|
import style from './Thumbnail.module.scss'
|
||||||
|
import { encodeVideoUrlPath } from '@/utils/string';
|
||||||
|
|
||||||
interface Props {
|
interface Props {
|
||||||
locale: string
|
locale: string
|
||||||
|
@ -22,7 +23,7 @@ const Thumbnail: React.FC<Props> = (props) => {
|
||||||
|
|
||||||
const { locale, videoUrl, imgUrl, text, show } = props
|
const { locale, videoUrl, imgUrl, text, show } = props
|
||||||
|
|
||||||
const encodedUri = encodeURIComponent(videoUrl)
|
const encodedUri = encodeVideoUrlPath(videoUrl)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className={classNames(style.thumbnailContainer, { [style.show]: show } )}>
|
<div className={classNames(style.thumbnailContainer, { [style.show]: show } )}>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
import { GalleryData } from "@/meta/data";
|
import { GalleryData } from "@/meta/data";
|
||||||
|
|
||||||
export const findVideoUrlInsideTagStringByFunctionNameAndExtension = (
|
export const findVideoUrlInsideTagStringByFunctionNameAndExtension = (
|
||||||
tagBlock: string, functionName: string, extension: string): string|null => {
|
tagBlock: string, functionName: string, extension: string): string | null => {
|
||||||
const start = tagBlock.indexOf(`html5player.${functionName}('`) + `html5player.${functionName}('`.length;
|
const start = tagBlock.indexOf(`html5player.${functionName}('`) + `html5player.${functionName}('`.length;
|
||||||
const end = tagBlock.toString().indexOf("'", start);
|
const end = tagBlock.toString().indexOf("'", start);
|
||||||
|
|
||||||
|
@ -14,7 +14,7 @@ export const findVideoUrlInsideTagStringByFunctionNameAndExtension = (
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
export const findRelatedVideos = (tagBlock: string): GalleryData[]|null => {
|
export const findRelatedVideos = (tagBlock: string): GalleryData[] | null => {
|
||||||
if (!(tagBlock.includes('video_related=['))) {
|
if (!(tagBlock.includes('video_related=['))) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
@ -48,4 +48,12 @@ export const removeHttpS = (url: string): string => {
|
||||||
return url.slice(8);
|
return url.slice(8);
|
||||||
}
|
}
|
||||||
return url;
|
return url;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const encodeVideoUrlPath = (input: string): string => {
|
||||||
|
return input.replace(/^\/+/, '').replace(/\/+$/, '').replace(/\//g, "-");
|
||||||
|
};
|
||||||
|
|
||||||
|
export const decodeVideoUrlPath = (input: string): string => {
|
||||||
|
return `/${input.replace(/^\-+/, '').replace(/\-+$/, '').replace(/\-/g, "/")}`;
|
||||||
|
};
|
Loading…
Reference in New Issue