diff options
| -rw-r--r-- | .github/workflows/container-release.yml | 15 | ||||
| -rw-r--r-- | locales/de.json | 28 | ||||
| -rw-r--r-- | locales/es.json | 2 | ||||
| -rw-r--r-- | locales/eu.json | 4 | ||||
| -rw-r--r-- | locales/ko.json | 2 | ||||
| -rw-r--r-- | locales/pt-BR.json | 16 | ||||
| -rw-r--r-- | locales/pt-PT.json | 156 | ||||
| -rw-r--r-- | locales/pt.json | 427 | ||||
| -rw-r--r-- | spec/helpers_spec.cr | 1 | ||||
| -rw-r--r-- | src/invidious/helpers/extractors.cr | 566 | ||||
| -rw-r--r-- | src/invidious/helpers/helpers.cr | 176 | ||||
| -rw-r--r-- | src/invidious/helpers/i18n.cr | 79 | ||||
| -rw-r--r-- | src/invidious/helpers/serialized_yt_data.cr | 256 | ||||
| -rw-r--r-- | src/invidious/search.cr | 247 | ||||
| -rw-r--r-- | src/invidious/videos.cr | 2 | ||||
| -rw-r--r-- | src/invidious/views/components/item.ecr | 1 |
16 files changed, 1450 insertions, 528 deletions
diff --git a/.github/workflows/container-release.yml b/.github/workflows/container-release.yml index c60d08fe..77b92c6f 100644 --- a/.github/workflows/container-release.yml +++ b/.github/workflows/container-release.yml @@ -23,6 +23,19 @@ jobs: steps: - name: Checkout uses: actions/checkout@v2 + + - name: Install Crystal + uses: oprypin/install-crystal@v1.2.4 + with: + crystal: 1.1.1 + + - name: Run lint + run: | + if ! crystal tool format --check; then + crystal tool format + git diff + exit 1 + fi - name: Set up QEMU uses: docker/setup-qemu-action@v1 @@ -61,4 +74,4 @@ jobs: labels: quay.expires-after=12w push: true tags: quay.io/invidious/invidious:${{ github.sha }}-arm64,quay.io/invidious/invidious:latest-arm64 - build-args: release=1
\ No newline at end of file + build-args: release=1 diff --git a/locales/de.json b/locales/de.json index 44725cbc..e438f503 100644 --- a/locales/de.json +++ b/locales/de.json @@ -77,8 +77,8 @@ "Fallback captions: ": "Ersatzuntertitel: ", "Show related videos: ": "Ähnliche Videos anzeigen? ", "Show annotations by default: ": "Standardmäßig Anmerkungen anzeigen? ", - "Automatically extend video description: ": "", - "Interactive 360 degree videos: ": "", + "Automatically extend video description: ": "Videobeschreibung automatisch erweitern: ", + "Interactive 360 degree videos: ": "Interaktive 360 Grad Videos: ", "Visual preferences": "Anzeigeeinstellungen", "Player style: ": "Abspielgeräterstil: ", "Dark mode: ": "Nachtmodus: ", @@ -86,8 +86,8 @@ "dark": "Nachtmodus", "light": "heller Modus", "Thin mode: ": "Schlanker Modus: ", - "Miscellaneous preferences": "", - "Automaticatic instance redirection (fallback to redirect.invidious.io): ": "", + "Miscellaneous preferences": "Sonstige Einstellungen", + "Automaticatic instance redirection (fallback to redirect.invidious.io): ": "Automatische Instanzweiterleitung (über redirect.invidious.io): ", "Subscription preferences": "Abonnementeinstellungen", "Show annotations by default for subscribed channels: ": "Anmerkungen für abonnierte Kanäle standardmäßig anzeigen? ", "Redirect homepage to feed: ": "Startseite zu Feed umleiten: ", @@ -117,7 +117,7 @@ "Administrator preferences": "Administrator-Einstellungen", "Default homepage: ": "Standard-Startseite: ", "Feed menu: ": "Feed-Menü: ", - "Show nickname on top: ": "", + "Show nickname on top: ": "Nutzernamen oben anzeigen: ", "Top enabled: ": "Top aktiviert? ", "CAPTCHA enabled: ": "CAPTCHA aktiviert? ", "Login enabled: ": "Anmeldung aktiviert: ", @@ -145,7 +145,7 @@ }, "search": "Suchen", "Log out": "Abmelden", - "Released under the AGPLv3 on Github.": "", + "Released under the AGPLv3 on Github.": "Auf Github unter der AGPLv3 Lizenz veröffentlicht.", "Source available here.": "Quellcode verfügbar hier.", "View JavaScript license information.": "Javascript Lizenzinformationen anzeigen.", "View privacy policy.": "Datenschutzerklärung einsehen.", @@ -161,11 +161,11 @@ "Title": "Titel", "Playlist privacy": "Vertrauliche Wiedergabeliste", "Editing playlist `x`": "Wiedergabeliste bearbeiten `x`", - "Show more": "", - "Show less": "", + "Show more": "Mehr anzeigen", + "Show less": "Weniger anzeigen", "Watch on YouTube": "Video auf YouTube ansehen", - "Switch Invidious Instance": "", - "Broken? Try another Invidious Instance": "", + "Switch Invidious Instance": "Invidious Instanz wechseln", + "Broken? Try another Invidious Instance": "Funktioniert nicht? Probiere eine andere Invidious Instanz aus", "Hide annotations": "Anmerkungen ausblenden", "Show annotations": "Anmerkungen anzeigen", "Genre: ": "Genre: ", @@ -410,7 +410,7 @@ "channel": "Kanal", "playlist": "Wiedergabeliste", "movie": "Film", - "show": "", + "show": "Anzeigen", "hd": "HD", "subtitles": "Untertitel / CC", "creative_commons": "Creative Commons", @@ -421,7 +421,7 @@ "hdr": "HDR", "filter": "Filtern", "Current version: ": "Aktuelle Version: ", - "next_steps_error_message": "", - "next_steps_error_message_refresh": "", - "next_steps_error_message_go_to_youtube": "" + "next_steps_error_message": "Danach folgendes versuchen: ", + "next_steps_error_message_refresh": "Neuladen", + "next_steps_error_message_go_to_youtube": "Zu YouTube gehen" } diff --git a/locales/es.json b/locales/es.json index 1f3f1c9e..d7e3dd61 100644 --- a/locales/es.json +++ b/locales/es.json @@ -341,7 +341,7 @@ "Yoruba": "Yoruba", "Zulu": "Zulú", "`x` years": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` años", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` año", "": "`x` años" }, "`x` months": { diff --git a/locales/eu.json b/locales/eu.json index df3f4329..e1f8d1c0 100644 --- a/locales/eu.json +++ b/locales/eu.json @@ -1,10 +1,10 @@ { "`x` subscribers": { - "([^.,0-9]|^)1([^.,0-9]|$)": "", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` harpidedunak", "": "`x` harpidedun" }, "`x` videos": { - "([^.,0-9]|^)1([^.,0-9]|$)": "", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` bideoak", "": "`x` bideo" }, "`x` playlists": { diff --git a/locales/ko.json b/locales/ko.json index 94f781d4..16d4797e 100644 --- a/locales/ko.json +++ b/locales/ko.json @@ -136,7 +136,7 @@ "Delete playlist": "재생목록 삭제", "Delete playlist `x`?": "재생목록 `x` 를 삭제 하시겠습니까?", "Updated `x` ago": "`x` 전에 업데이트됨", - "Released under the AGPLv3 on Github.": "", + "Released under the AGPLv3 on Github.": "Github에 AGPLv3 으로 배포됩니다.", "View all playlists": "모든 재생목록 보기", "Private": "비공개", "Unlisted": "목록에 없음", diff --git a/locales/pt-BR.json b/locales/pt-BR.json index f1ffb7a8..870bf070 100644 --- a/locales/pt-BR.json +++ b/locales/pt-BR.json @@ -341,31 +341,31 @@ "Yoruba": "Iorubá", "Zulu": "Zulu", "`x` years": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` anos", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` ano", "": "`x` anos" }, "`x` months": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` meses", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` mês", "": "`x` meses" }, "`x` weeks": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` semanas", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` semana", "": "`x` semanas" }, "`x` days": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` dias", - "": "`x` dias" + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` dia", + "": "`x` dia" }, "`x` hours": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` horas", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` hora", "": "`x` horas" }, "`x` minutes": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` minutos", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` minuto", "": "`x` minutos" }, "`x` seconds": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` segundos", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` segundo", "": "`x` segundos" }, "Fallback comments: ": "Comentários alternativos: ", diff --git a/locales/pt-PT.json b/locales/pt-PT.json index a5e4bca8..08220d43 100644 --- a/locales/pt-PT.json +++ b/locales/pt-PT.json @@ -26,12 +26,12 @@ "Clear watch history?": "Limpar histórico de reprodução?", "New password": "Nova palavra-chave", "New passwords must match": "As novas palavra-chaves devem corresponder", - "Cannot change password for Google accounts": "Não é possível alterar a palavra-passe para contas do Google", + "Cannot change password for Google accounts": "Não é possível alterar a palavra-chave para contas do Google", "Authorize token?": "Autorizar token?", "Authorize token for `x`?": "Autorizar token para `x`?", "Yes": "Sim", "No": "Não", - "Import and Export Data": "Importar e Exportar Dados", + "Import and Export Data": "Importar e exportar dados", "Import": "Importar", "Import Invidious data": "Importar dados do Invidious", "Import YouTube subscriptions": "Importar subscrições do YouTube", @@ -42,20 +42,20 @@ "Export subscriptions as OPML": "Exportar subscrições como OPML", "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exportar subscrições como OPML (para NewPipe e FreeTube)", "Export data as JSON": "Exportar dados como JSON", - "Delete account?": "Apagar conta?", + "Delete account?": "Eliminar conta?", "History": "Histórico", "An alternative front-end to YouTube": "Uma interface alternativa ao YouTube", "JavaScript license information": "Informação de licença do JavaScript", "source": "código-fonte", "Log in": "Iniciar sessão", - "Log in/register": "Iniciar sessão/Registar", + "Log in/register": "Iniciar sessão/registar", "Log in with Google": "Iniciar sessão com o Google", "User ID": "Utilizador", "Password": "Palavra-chave", "Time (h:mm:ss):": "Tempo (h:mm:ss):", "Text CAPTCHA": "Texto CAPTCHA", "Image CAPTCHA": "Imagem CAPTCHA", - "Sign In": "Iniciar Sessão", + "Sign In": "Iniciar sessão", "Register": "Registar", "E-mail": "E-mail", "Google verification code": "Código de verificação do Google", @@ -63,7 +63,7 @@ "Player preferences": "Preferências do reprodutor", "Always loop: ": "Repetir sempre: ", "Autoplay: ": "Reprodução automática: ", - "Play next by default: ": "Sempre reproduzir próximo: ", + "Play next by default: ": "Reproduzir sempre o próximo: ", "Autoplay next video: ": "Reproduzir próximo vídeo automaticamente: ", "Listen by default: ": "Apenas áudio: ", "Proxy videos: ": "Usar proxy nos vídeos: ", @@ -76,9 +76,9 @@ "Default captions: ": "Legendas predefinidas: ", "Fallback captions: ": "Legendas alternativas: ", "Show related videos: ": "Mostrar vídeos relacionados: ", - "Show annotations by default: ": "Mostrar sempre anotações: ", - "Automatically extend video description: ": "", - "Interactive 360 degree videos: ": "", + "Show annotations by default: ": "Mostrar anotações sempre: ", + "Automatically extend video description: ": "Estender automaticamente a descrição do vídeo: ", + "Interactive 360 degree videos: ": "Vídeos interativos de 360 graus: ", "Visual preferences": "Preferências visuais", "Player style: ": "Estilo do reprodutor: ", "Dark mode: ": "Modo escuro: ", @@ -86,8 +86,8 @@ "dark": "escuro", "light": "claro", "Thin mode: ": "Modo compacto: ", - "Miscellaneous preferences": "", - "Automaticatic instance redirection (fallback to redirect.invidious.io): ": "", + "Miscellaneous preferences": "Preferências diversas", + "Automaticatic instance redirection (fallback to redirect.invidious.io): ": "Redirecionamento de instância automática (solução de último recurso para redirect.invidious.io): ", "Subscription preferences": "Preferências de subscrições", "Show annotations by default for subscribed channels: ": "Mostrar sempre anotações aos canais subscritos: ", "Redirect homepage to feed: ": "Redirecionar página inicial para subscrições: ", @@ -108,22 +108,22 @@ "`x` is live": "`x` está em direto", "Data preferences": "Preferências de dados", "Clear watch history": "Limpar histórico de reprodução", - "Import/export data": "Importar/Exportar dados", + "Import/export data": "Importar / exportar dados", "Change password": "Alterar palavra-chave", "Manage subscriptions": "Gerir as subscrições", "Manage tokens": "Gerir tokens", "Watch history": "Histórico de reprodução", - "Delete account": "Apagar conta", + "Delete account": "Eliminar conta", "Administrator preferences": "Preferências de administrador", "Default homepage: ": "Página inicial predefinida: ", "Feed menu: ": "Menu de subscrições: ", - "Show nickname on top: ": "", - "Top enabled: ": "Top ativado: ", + "Show nickname on top: ": "Mostrar nome de utilizador em cima: ", + "Top enabled: ": "Destaques ativados: ", "CAPTCHA enabled: ": "CAPTCHA ativado: ", "Login enabled: ": "Iniciar sessão ativado: ", "Registration enabled: ": "Registar ativado: ", "Report statistics: ": "Relatório de estatísticas: ", - "Save preferences": "Gravar preferências", + "Save preferences": "Guardar preferências", "Subscription manager": "Gerir subscrições", "Token manager": "Gerir tokens", "Token": "Token", @@ -135,17 +135,17 @@ "([^.,0-9]|^)1([^.,0-9]|$)": "`x` tokens", "": "`x` tokens" }, - "Import/export": "Importar/Exportar", - "unsubscribe": "Anular subscrição", + "Import/export": "Importar / exportar", + "unsubscribe": "anular subscrição", "revoke": "revogar", "Subscriptions": "Subscrições", "`x` unseen notifications": { "([^.,0-9]|^)1([^.,0-9]|$)": "`x` notificações não vistas", "": "`x` notificações não vistas" }, - "search": "Pesquisar", + "search": "pesquisar", "Log out": "Terminar sessão", - "Released under the AGPLv3 on Github.": "", + "Released under the AGPLv3 on Github.": "Lançado sob a AGPLv3 no Github.", "Source available here.": "Código-fonte disponível aqui.", "View JavaScript license information.": "Ver informações da licença do JavaScript.", "View privacy policy.": "Ver a política de privacidade.", @@ -155,17 +155,17 @@ "Private": "Privado", "View all playlists": "Ver todas as listas de reprodução", "Updated `x` ago": "Atualizado `x` atrás", - "Delete playlist `x`?": "Apagar a lista de reprodução 'x'?", - "Delete playlist": "Apagar lista de reprodução", + "Delete playlist `x`?": "Eliminar a lista de reprodução 'x'?", + "Delete playlist": "Eliminar lista de reprodução", "Create playlist": "Criar lista de reprodução", "Title": "Título", "Playlist privacy": "Privacidade da lista de reprodução", "Editing playlist `x`": "A editar lista de reprodução 'x'", - "Show more": "", - "Show less": "", + "Show more": "Mostrar mais", + "Show less": "Mostrar menos", "Watch on YouTube": "Ver no YouTube", - "Switch Invidious Instance": "", - "Broken? Try another Invidious Instance": "", + "Switch Invidious Instance": "Mudar a instância do Invidious", + "Broken? Try another Invidious Instance": "Falhou? Tente outra Instância do Invidious", "Hide annotations": "Ocultar anotações", "Show annotations": "Mostrar anotações", "Genre: ": "Género: ", @@ -182,7 +182,7 @@ }, "Premieres in `x`": "Estreias em 'x'", "Premieres `x`": "Estreias 'x'", - "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Oi! Parece que JavaScript está desativado. Clique aqui para ver os comentários, entretanto eles podem levar mais tempo para carregar.", + "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Olá! Parece que o JavaScript está desativado. Clique aqui para ver os comentários, entretanto eles podem levar mais tempo para carregar.", "View YouTube comments": "Ver comentários do YouTube", "View more comments on Reddit": "Ver mais comentários no Reddit", "View `x` comments": { @@ -194,9 +194,9 @@ "Show replies": "Mostrar respostas", "Incorrect password": "Palavra-chave incorreta", "Quota exceeded, try again in a few hours": "Cota excedida. Tente novamente dentro de algumas horas", - "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Não é possível iniciar sessão, certifique-se de que a autenticação de dois fatores (Autenticador ou SMS) está ativada.", + "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Não é possível iniciar a sessão, certifique-se que a autenticação de dois fatores (Autenticador ou SMS) está ativada.", "Invalid TFA code": "Código TFA inválido", - "Login failed. This may be because two-factor authentication is not turned on for your account.": "Falhou o início de sessão. Isto pode ser devido a dois fatores de autenticação não está ativado para sua conta.", + "Login failed. This may be because two-factor authentication is not turned on for your account.": "Falhou o início de sessão. Isto pode ser devido a não ter ativado na sua conta a autenticação de dois fatores (2FA).", "Wrong answer": "Resposta errada", "Erroneous CAPTCHA": "CAPTCHA inválido", "CAPTCHA is a required field": "CAPTCHA é um campo obrigatório", @@ -209,7 +209,7 @@ "Please log in": "Por favor, inicie sessão", "Invidious Private Feed for `x`": "Feed Privado do Invidious para `x`", "channel:`x`": "canal:'x'", - "Deleted or invalid channel": "Canal apagado ou inválido", + "Deleted or invalid channel": "Canal eliminado ou inválido", "This channel does not exist.": "Este canal não existe.", "Could not get channel info.": "Não foi possível obter as informações do canal.", "Could not fetch comments": "Não foi possível obter os comentários", @@ -223,11 +223,11 @@ "([^.,0-9]|^)1([^.,0-9]|$)": "`x` pontos", "": "`x` pontos" }, - "Could not create mix.": "Não foi possível criar mistura.", + "Could not create mix.": "Não foi possível criar a mistura.", "Empty playlist": "Lista de reprodução vazia", "Not a playlist.": "Não é uma lista de reprodução.", "Playlist does not exist.": "A lista de reprodução não existe.", - "Could not pull trending pages.": "Não foi possível obter páginas de tendências.", + "Could not pull trending pages.": "Não foi possível obter as páginas de tendências.", "Hidden field \"challenge\" is a required field": "O campo oculto \"desafio\" é obrigatório", "Hidden field \"token\" is a required field": "O campo oculto \"token\" é um campo obrigatório", "Erroneous challenge": "Desafio inválido", @@ -250,8 +250,8 @@ "Burmese": "Birmanês", "Catalan": "Catalão", "Cebuano": "Cebuano", - "Chinese (Simplified)": "Chinês (Simplificado)", - "Chinese (Traditional)": "Chinês (Tradicional)", + "Chinese (Simplified)": "Chinês (simplificado)", + "Chinese (Traditional)": "Chinês (tradicional)", "Corsican": "Corso", "Croatian": "Croata", "Czech": "Checo", @@ -341,87 +341,87 @@ "Yoruba": "Ioruba", "Zulu": "Zulu", "`x` years": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` anos", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` ano", "": "`x` anos" }, "`x` months": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` meses", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` mês", "": "`x` meses" }, "`x` weeks": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` semanas", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` seman", "": "`x` semanas" }, "`x` days": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` dias", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` dia", "": "`x` dias" }, "`x` hours": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` horas", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` hora", "": "`x` horas" }, "`x` minutes": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` minutos", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` minuto", "": "`x` minutos" }, "`x` seconds": { - "([^.,0-9]|^)1([^.,0-9]|$)": "`x` segundos", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` segundo", "": "`x` segundos" }, "Fallback comments: ": "Comentários alternativos: ", "Popular": "Popular", - "Search": "", - "Top": "Top", + "Search": "Pesquisar", + "Top": "Destaques", "About": "Sobre", "Rating: ": "Avaliação: ", "Language: ": "Idioma: ", "View as playlist": "Ver como lista de reprodução", - "Default": "Predefinição", + "Default": "Predefinido", "Music": "Música", "Gaming": "Jogos", "News": "Notícias", "Movies": "Filmes", - "Download": "Transferir", - "Download as: ": "Transferir como: ", + "Download": "Descarregar", + "Download as: ": "Descarregar como: ", "%A %B %-d, %Y": "%A %B %-d, %Y", "(edited)": "(editado)", - "YouTube comment permalink": "Hiperligação permanente ao comentário do YouTube", - "permalink": "ligação permanente", + "YouTube comment permalink": "Hiperligação permanente do comentário no YouTube", + "permalink": "hiperligação permanente", "`x` marked it with a ❤": "`x` foi marcado como ❤", "Audio mode": "Modo de áudio", "Video mode": "Modo de vídeo", "Videos": "Vídeos", "Playlists": "Listas de reprodução", "Community": "Comunidade", - "relevance": "", - "rating": "", - "date": "", - "views": "", - "content_type": "", - "duration": "", - "features": "", - "sort": "", - "hour": "", - "today": "", - "week": "", - "month": "", - "year": "", - "video": "", - "channel": "", - "playlist": "", - "movie": "", - "show": "", - "hd": "", - "subtitles": "", - "creative_commons": "", - "3d": "", - "live": "", - "4k": "", - "location": "", - "hdr": "", - "filter": "", + "relevance": "Relevância", + "rating": "Avaliação", + "date": "Data de envio", + "views": "Visualizações", + "content_type": "Tipo", + "duration": "Duração", + "features": "Funcionalidades", + "sort": "Ordenar por", + "hour": "Última hora", + "today": "Hoje", + "week": "Esta semana", + "month": "Este mês", + "year": "Este ano", + "video": "Vídeo", + "channel": "Canal", + "playlist": "Lista de reprodução", + "movie": "Filme", + "show": "Espetáculo", + "hd": "HD", + "subtitles": "Legendas", + "creative_commons": "Creative Commons", + "3d": "3D", + "live": "Em direto", + "4k": "4K", + "location": "Localização", + "hdr": "HDR", + "filter": "Filtro", "Current version: ": "Versão atual: ", - "next_steps_error_message": "", - "next_steps_error_message_refresh": "", - "next_steps_error_message_go_to_youtube": "" + "next_steps_error_message": "Pode tentar as seguintes opções: ", + "next_steps_error_message_refresh": "Atualizar", + "next_steps_error_message_go_to_youtube": "Ir ao YouTube" } diff --git a/locales/pt.json b/locales/pt.json new file mode 100644 index 00000000..d7b1f728 --- /dev/null +++ b/locales/pt.json @@ -0,0 +1,427 @@ +{ + "show": "Espetáculo", + "views": "Visualizações", + "date": "Data de envio", + "rating": "Avaliação", + "relevance": "Relevância", + "Broken? Try another Invidious Instance": "Falhou? Tente outra Instância do Invidious", + "Switch Invidious Instance": "Mudar a instância do Invidious", + "Show less": "Mostrar menos", + "Show more": "Mostrar mais", + "Released under the AGPLv3 on Github.": "Lançado sob a AGPLv3 no Github.", + "Show nickname on top: ": "Mostrar nome de utilizador em cima: ", + "Automaticatic instance redirection (fallback to redirect.invidious.io): ": "Redirecionamento de instância automática (solução de último recurso para redirect.invidious.io): ", + "Miscellaneous preferences": "Preferências diversas", + "Interactive 360 degree videos: ": "Vídeos interativos de 360 graus: ", + "Automatically extend video description: ": "Estender automaticamente a descrição do vídeo: ", + "next_steps_error_message_go_to_youtube": "Ir ao YouTube", + "next_steps_error_message": "Pode tentar as seguintes opções: ", + "next_steps_error_message_refresh": "Atualizar", + "filter": "Filtro", + "hdr": "HDR", + "location": "Localização", + "4k": "4K", + "live": "Em direto", + "3d": "3D", + "creative_commons": "Creative Commons", + "subtitles": "Legendas", + "hd": "HD", + "movie": "Filme", + "playlist": "Lista de reprodução", + "channel": "Canal", + "video": "Vídeo", + "year": "Este ano", + "month": "Este mês", + "week": "Esta semana", + "today": "Hoje", + "hour": "Última hora", + "sort": "Ordenar por", + "features": "Funcionalidades", + "duration": "Duração", + "content_type": "Tipo", + "permalink": "hiperligação permanente", + "YouTube comment permalink": "Hiperligação permanente do comentário no YouTube", + "Download as: ": "Descarregar como: ", + "Download": "Descarregar", + "Default": "Predefinido", + "Top": "Destaques", + "Search": "Pesquisar", + "`x` seconds": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` segundo", + "": "`x` segundos" + }, + "`x` minutes": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` minuto", + "": "`x` minutos" + }, + "`x` hours": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` hora", + "": "`x` horas" + }, + "`x` days": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` dia", + "": "`x` dias" + }, + "`x` weeks": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` seman", + "": "`x` semanas" + }, + "`x` months": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` mês", + "": "`x` meses" + }, + "`x` years": { + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` ano", + "": "`x` anos" + }, + "Chinese (Traditional)": "Chinês (tradicional)", + "Chinese (Simplified)": "Chinês (simplificado)", + "Could not pull trending pages.": "Não foi possível obter as páginas de tendências.", + "Could not create mix.": "Não foi possível criar a mistura.", + "Deleted or invalid channel": "Canal eliminado ou inválido", + "Login failed. This may be because two-factor authentication is not turned on for your account.": "Falhou o início de sessão. Isto pode ser devido a não ter ativado na sua conta a autenticação de dois fatores (2FA).", + "Unable to log in, make sure two-factor authentication (Authenticator or SMS) is turned on.": "Não é possível iniciar a sessão, certifique-se que a autenticação de dois fatores (Autenticador ou SMS) está ativada.", + "Hi! Looks like you have JavaScript turned off. Click here to view comments, keep in mind they may take a bit longer to load.": "Olá! Parece que o JavaScript está desativado. Clique aqui para ver os comentários, entretanto eles podem levar mais tempo para carregar.", + "Delete playlist": "Eliminar lista de reprodução", + "Delete playlist `x`?": "Eliminar a lista de reprodução 'x'?", + "search": "pesquisar", + "unsubscribe": "anular subscrição", + "Import/export": "Importar / exportar", + "Save preferences": "Guardar preferências", + "Top enabled: ": "Destaques ativados: ", + "Delete account": "Eliminar conta", + "Import/export data": "Importar / exportar dados", + "Show annotations by default: ": "Mostrar anotações sempre: ", + "Play next by default: ": "Reproduzir sempre o próximo: ", + "Sign In": "Iniciar sessão", + "Log in/register": "Iniciar sessão/registar", + "Delete account?": "Eliminar conta?", + "Import and Export Data": "Importar e exportar dados", + "Cannot change password for Google accounts": "Não é possível alterar a palavra-chave para contas do Google", + "Filipino": "Filipino", + "Estonian": "Estónio", + "Esperanto": "Esperanto", + "Dutch": "Holandês", + "Danish": "Dinamarquês", + "Czech": "Checo", + "Croatian": "Croata", + "Corsican": "Corso", + "Cebuano": "Cebuano", + "Catalan": "Catalão", + "Burmese": "Birmanês", + "Bulgarian": "Búlgaro", + "Bosnian": "Bósnio", + "Belarusian": "Bielorrusso", + "Basque": "Basco", + "Bangla": "Bangla", + "Azerbaijani": "Azerbaijano", + "Armenian": "Arménio", + "Arabic": "Árabe", + "Amharic": "Amárico", + "Albanian": "Albanês", + "Afrikaans": "Africano", + "English (auto-generated)": "Inglês (auto-gerado)", + "English": "Inglês", + "Token is expired, please try again": "Token expirou, tente novamente", + "No such user": "Utilizador inválido", + "Erroneous token": "Token inválido", + "Erroneous challenge": "Desafio inválido", + "Hidden field \"token\" is a required field": "O campo oculto \"token\" é um campo obrigatório", + "Hidden field \"challenge\" is a required field": "O campo oculto \"desafio\" é obrigatório", + "Playlist does not exist.": "A lista de reprodução não existe.", + "Not a playlist.": "Não é uma lista de reprodução.", + "Empty playlist": "Lista de reprodução vazia", + "`x` points": { + "": "`x` pontos", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` pontos" + }, + "Load more": "Carregar mais", + "`x` ago": "`x` atrás", + "View `x` replies": { + "": "Ver `x` respostas", + "([^.,0-9]|^)1([^.,0-9]|$)": "Ver `x` respostas" + }, + "Could not fetch comments": "Não foi possível obter os comentários", + "Could not get channel info.": "Não foi possível obter as informações do canal.", + "This channel does not exist.": "Este canal não existe.", + "channel:`x`": "canal:'x'", + "Invidious Private Feed for `x`": "Feed Privado do Invidious para `x`", + "Please log in": "Por favor, inicie sessão", + "Password cannot be longer than 55 characters": "A palavra-chave não pode ser superior a 55 caracteres", + "Password cannot be empty": "A palavra-chave não pode estar vazia", + "Please sign in using 'Log in with Google'": "Por favor, inicie sessão usando 'Iniciar sessão com o Google'", + "Wrong username or password": "Nome de utilizador ou palavra-chave incorreto", + "Password is a required field": "Palavra-chave é um campo obrigatório", + "User ID is a required field": "O nome de utilizador é um campo obrigatório", + "CAPTCHA is a required field": "CAPTCHA é um campo obrigatório", + "Erroneous CAPTCHA": "CAPTCHA inválido", + "Wrong answer": "Resposta errada", + "Invalid TFA code": "Código TFA inválido", + "Quota exceeded, try again in a few hours": "Cota excedida. Tente novamente dentro de algumas horas", + "Incorrect password": "Palavra-chave incorreta", + "Show replies": "Mostrar respostas", + "Hide replies": "Ocultar respostas", + "View Reddit comments": "Ver comentários do Reddit", + "View `x` comments": { + "": "Ver `x` comentários", + "([^.,0-9]|^)1([^.,0-9]|$)": "Ver `x` comentários" + }, + "View more comments on Reddit": "Ver mais comentários no Reddit", + "View YouTube comments": "Ver comentários do YouTube", + "Premieres `x`": "Estreias 'x'", + "Premieres in `x`": "Estreias em 'x'", + "`x` views": { + "": "`x` visualizações", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` visualizações" + }, + "Shared `x`": "Partilhado `x`", + "Blacklisted regions: ": "Regiões bloqueadas: ", + "Whitelisted regions: ": "Regiões permitidas: ", + "Engagement: ": "Compromisso: ", + "Wilson score: ": "Pontuação de Wilson: ", + "Family friendly? ": "Filtrar conteúdo impróprio: ", + "License: ": "Licença: ", + "Genre: ": "Género: ", + "Show annotations": "Mostrar anotações", + "Hide annotations": "Ocultar anotações", + "Watch on YouTube": "Ver no YouTube", + "Editing playlist `x`": "A editar lista de reprodução 'x'", + "Playlist privacy": "Privacidade da lista de reprodução", + "Title": "Título", + "Create playlist": "Criar lista de reprodução", + "Updated `x` ago": "Atualizado `x` atrás", + "View all playlists": "Ver todas as listas de reprodução", + "Private": "Privado", + "Unlisted": "Não listado", + "Public": "Público", + "Trending": "Tendências", + "View privacy policy.": "Ver a política de privacidade.", + "View JavaScript license information.": "Ver informações da licença do JavaScript.", + "Source available here.": "Código-fonte disponível aqui.", + "Log out": "Terminar sessão", + "`x` unseen notifications": { + "": "`x` notificações não vistas", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` notificações não vistas" + }, + "Subscriptions": "Subscrições", + "revoke": "revogar", + "`x` tokens": { + "": "`x` tokens", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` tokens" + }, + "`x` subscriptions": { + "": "`x` subscrições", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` subscrições" + }, + "Token": "Token", + "Token manager": "Gerir tokens", + "Subscription manager": "Gerir subscrições", + "Report statistics: ": "Relatório de estatísticas: ", + "Registration enabled: ": "Registar ativado: ", + "Login enabled: ": "Iniciar sessão ativado: ", + "CAPTCHA enabled: ": "CAPTCHA ativado: ", + "Feed menu: ": "Menu de subscrições: ", + "Default homepage: ": "Página inicial predefinida: ", + "Administrator preferences": "Preferências de administrador", + "Watch history": "Histórico de reprodução", + "Manage tokens": "Gerir tokens", + "Manage subscriptions": "Gerir as subscrições", + "Change password": "Alterar palavra-chave", + "Clear watch history": "Limpar histórico de reprodução", + "Data preferences": "Preferências de dados", + "`x` is live": "`x` está em direto", + "`x` uploaded a video": "`x` publicou um novo vídeo", + "Enable web notifications": "Ativar notificações pela web", + "Only show notifications (if there are any): ": "Mostrar apenas notificações (se existirem): ", + "Only show unwatched: ": "Mostrar apenas vídeos não visualizados: ", + "Only show latest unwatched video from channel: ": "Mostrar apenas vídeos mais recentes não visualizados do canal: ", + "Only show latest video from channel: ": "Mostrar apenas o vídeo mais recente do canal: ", + "channel name - reverse": "nome do canal - inverso", + "channel name": "nome do canal", + "alphabetically - reverse": "alfabeticamente - inverso", + "alphabetically": "alfabeticamente", + "published - reverse": "publicado - inverso", + "published": "publicado", + "Sort videos by: ": "Ordenar vídeos por: ", + "Number of videos shown in feed: ": "Quantidade de vídeos nas subscrições: ", + "Redirect homepage to feed: ": "Redirecionar página inicial para subscrições: ", + "Show annotations by default for subscribed channels: ": "Mostrar sempre anotações aos canais subscritos: ", + "Subscription preferences": "Preferências de subscrições", + "Thin mode: ": "Modo compacto: ", + "light": "claro", + "dark": "escuro", + "Theme: ": "Tema: ", + "Dark mode: ": "Modo escuro: ", + "Player style: ": "Estilo do reprodutor: ", + "Visual preferences": "Preferências visuais", + "Show related videos: ": "Mostrar vídeos relacionados: ", + "Fallback captions: ": "Legendas alternativas: ", + "Default captions: ": "Legendas predefinidas: ", + "reddit": "reddit", + "youtube": "YouTube", + "Default comments: ": "Preferência dos comentários: ", + "Player volume: ": "Volume da reprodução: ", + "Preferred video quality: ": "Qualidade de vídeo preferida: ", + "Default speed: ": "Velocidade preferida: ", + "Proxy videos: ": "Usar proxy nos vídeos: ", + "Listen by default: ": "Apenas áudio: ", + "Autoplay next video: ": "Reproduzir próximo vídeo automaticamente: ", + "Autoplay: ": "Reprodução automática: ", + "Always loop: ": "Repetir sempre: ", + "Player preferences": "Preferências do reprodutor", + "Preferences": "Preferências", + "Google verification code": "Código de verificação do Google", + "E-mail": "E-mail", + "Register": "Registar", + "Image CAPTCHA": "Imagem CAPTCHA", + "Text CAPTCHA": "Texto CAPTCHA", + "Time (h:mm:ss):": "Tempo (h:mm:ss):", + "Password": "Palavra-chave", + "User ID": "Utilizador", + "Log in with Google": "Iniciar sessão com o Google", + "Log in": "Iniciar sessão", + "source": "código-fonte", + "JavaScript license information": "Informação de licença do JavaScript", + "An alternative front-end to YouTube": "Uma interface alternativa ao YouTube", + "History": "Histórico", + "Export data as JSON": "Exportar dados como JSON", + "Export subscriptions as OPML (for NewPipe & FreeTube)": "Exportar subscrições como OPML (para NewPipe e FreeTube)", + "Export subscriptions as OPML": "Exportar subscrições como OPML", + "Export": "Exportar", + "Import NewPipe data (.zip)": "Importar dados do NewPipe (.zip)", + "Import NewPipe subscriptions (.json)": "Importar subscrições do NewPipe (.json)", + "Import FreeTube subscriptions (.db)": "Importar subscrições do FreeTube (.db)", + "Import YouTube subscriptions": "Importar subscrições do YouTube", + "Import Invidious data": "Importar dados do Invidious", + "Import": "Importar", + "No": "Não", + "Yes": "Sim", + "Authorize token for `x`?": "Autorizar token para `x`?", + "Authorize token?": "Autorizar token?", + "New passwords must match": "As novas palavra-chaves devem corresponder", + "New password": "Nova palavra-chave", + "Clear watch history?": "Limpar histórico de reprodução?", + "Previous page": "Página anterior", + "Next page": "Próxima página", + "last": "últimos", + "Current version: ": "Versão atual: ", + "Community": "Comunidade", + "Playlists": "Listas de reprodução", + "Videos": "Vídeos", + "Video mode": "Modo de vídeo", + "Audio mode": "Modo de áudio", + "`x` marked it with a ❤": "`x` foi marcado como ❤", + "(edited)": "(editado)", + "%A %B %-d, %Y": "%A %B %-d, %Y", + "Movies": "Filmes", + "News": "Notícias", + "Gaming": "Jogos", + "Music": "Música", + "View as playlist": "Ver como lista de reprodução", + "Language: ": "Idioma: ", + "Rating: ": "Avaliação: ", + "About": "Sobre", + "Popular": "Popular", + "Fallback comments: ": "Comentários alternativos: ", + "Zulu": "Zulu", + "Yoruba": "Ioruba", + "Yiddish": "Iídiche", + "Xhosa": "Xhosa", + "Western Frisian": "Frísio Ocidental", + "Welsh": "Galês", + "Vietnamese": "Vietnamita", + "Uzbek": "Uzbeque", + "Urdu": "Urdu", + "Ukrainian": "Ucraniano", + "Turkish": "Turco", + "Thai": "Tailandês", + "Telugu": "Telugu", + "Tamil": "Tâmil", + "Tajik": "Tajique", + "Swedish": "Sueco", + "Swahili": "Suaíli", + "Sundanese": "Sudanês", + "Spanish (Latin America)": "Espanhol (América Latina)", + "Spanish": "Espanhol", + "Southern Sotho": "Sotho do Sul", + "Somali": "Somali", + "Slovenian": "Esloveno", + "Slovak": "Eslovaco", + "Sinhala": "Cingalês", + "Sindhi": "Sindhi", + "Shona": "Shona", + "Serbian": "Sérvio", + "Scottish Gaelic": "Gaélico escocês", + "Samoan": "Samoano", + "Russian": "Russo", + "Romanian": "Romeno", + "Punjabi": "Punjabi", + "Portuguese": "Português", + "Polish": "Polaco", + "Persian": "Persa", + "Pashto": "Pashto", + "Nyanja": "Nyanja", + "Norwegian Bokmål": "Bokmål norueguês", + "Nepali": "Nepalês", + "Mongolian": "Mongol", + "Marathi": "Marathi", + "Maori": "Maori", + "Maltese": "Maltês", + "Malayalam": "Malaiala", + "Malay": "Malaio", + "Malagasy": "Malgaxe", + "Macedonian": "Macedónio", + "Luxembourgish": "Luxemburguês", + "Lithuanian": "Lituano", + "Latvian": "Letão", + "Latin": "Latim", + "Lao": "Laosiano", + "Kyrgyz": "Quirguiz", + "Kurdish": "Curdo", + "Korean": "Coreano", + "Khmer": "Khmer", + "Kazakh": "Cazaque", + "Kannada": "Canarim", + "Javanese": "Javanês", + "Japanese": "Japonês", + "Italian": "Italiano", + "Irish": "Irlandês", + "Indonesian": "Indonésio", + "Igbo": "Igbo", + "Icelandic": "Islandês", + "Hungarian": "Húngaro", + "Hmong": "Hmong", + "Hindi": "Hindi", + "Hebrew": "Hebraico", + "Hawaiian": "Havaiano", + "Hausa": "Hauçá", + "Haitian Creole": "Crioulo haitiano", + "Gujarati": "Guzerate", + "Greek": "Grego", + "German": "Alemão", + "Georgian": "Georgiano", + "Galician": "Galego", + "French": "Francês", + "Finnish": "Finlandês", + "popular": "popular", + "oldest": "mais antigos", + "newest": "mais recentes", + "View playlist on YouTube": "Ver lista de reprodução no YouTube", + "View channel on YouTube": "Ver canal no YouTube", + "Subscribe": "Subscrever", + "Unsubscribe": "Anular subscrição", + "Shared `x` ago": "Partilhado `x` atrás", + "LIVE": "Em direto", + "`x` playlists": { + "": "`x` listas de reprodução", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` listas de reprodução" + }, + "`x` videos": { + "": "`x` vídeos", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` videos" + }, + "`x` subscribers": { + "": "`x` subscritores", + "([^.,0-9]|^)1([^.,0-9]|$)": "`x` subscritores" + } +} diff --git a/spec/helpers_spec.cr b/spec/helpers_spec.cr index ada5b28f..b17c8d73 100644 --- a/spec/helpers_spec.cr +++ b/spec/helpers_spec.cr @@ -6,6 +6,7 @@ require "spec" require "yaml" require "../src/invidious/helpers/*" require "../src/invidious/channels/*" +require "../src/invidious/videos" require "../src/invidious/comments" require "../src/invidious/playlists" require "../src/invidious/search" diff --git a/src/invidious/helpers/extractors.cr b/src/invidious/helpers/extractors.cr new file mode 100644 index 00000000..850c93ec --- /dev/null +++ b/src/invidious/helpers/extractors.cr @@ -0,0 +1,566 @@ +# This file contains helper methods to parse the Youtube API json data into +# neat little packages we can use + +# Tuple of Parsers/Extractors so we can easily cycle through them. +private ITEM_CONTAINER_EXTRACTOR = { + Extractors::YouTubeTabs, + Extractors::SearchResults, + Extractors::Continuation, +} + +private ITEM_PARSERS = { + Parsers::VideoRendererParser, + Parsers::ChannelRendererParser, + Parsers::GridPlaylistRendererParser, + Parsers::PlaylistRendererParser, + Parsers::CategoryRendererParser, +} + +record AuthorFallback, name : String, id : String + +# Namespace for logic relating to parsing InnerTube data into various datastructs. +# +# Each of the parsers in this namespace are accessed through the #process() method +# which validates the given data as applicable to itself. If it is applicable the given +# data is passed to the private `#parse()` method which returns a datastruct of the given +# type. Otherwise, nil is returned. +private module Parsers + # Parses a InnerTube videoRenderer into a SearchVideo. Returns nil when the given object isn't a videoRenderer + # + # A videoRenderer renders a video to click on within the YouTube and Invidious UI. It is **not** + # the watchable video itself. + # + # See specs for example. + # + # `videoRenderer`s can be found almost everywhere on YouTube. In categories, search results, channels, etc. + # + module VideoRendererParser + def self.process(item : JSON::Any, author_fallback : AuthorFallback) + if item_contents = (item["videoRenderer"]? || item["gridVideoRenderer"]?) + return self.parse(item_contents, author_fallback) + end + end + + private def self.parse(item_contents, author_fallback) + video_id = item_contents["videoId"].as_s + title = extract_text(item_contents["title"]) || "" + + # Extract author information + if author_info = item_contents.dig?("ownerText", "runs", 0) + author = author_info["text"].as_s + author_id = HelperExtractors.get_browse_id(author_info) + else + author = author_fallback.name + author_id = author_fallback.id + end + + # For live videos (and possibly recently premiered videos) there is no published information. + # Instead, in its place is the amount of people currently watching. This behavior should be replicated + # on Invidious once all features of livestreams are supported. On an unrelated note, defaulting to the current + # time for publishing isn't a good idea. + published = item_contents.dig?("publishedTimeText", "simpleText").try { |t| decode_date(t.as_s) } || Time.local + + # Typically views are stored under a "simpleText" in the "viewCountText". However, for + # livestreams and premiered it is stored under a "runs" array: [{"text":123}, {"text": "watching"}] + # When view count is disabled the "viewCountText" is not present on InnerTube data. + # TODO change default value to nil and typical encoding type to tuple storing type (watchers, views, etc) + # and count + view_count = item_contents.dig?("viewCountText", "simpleText").try &.as_s.gsub(/\D+/, "").to_i64? || 0_i64 + description_html = item_contents["descriptionSnippet"]?.try { |t| parse_content(t) } || "" + + # The length information *should* only always exist in "lengthText". However, the legacy Invidious code + # extracts from "thumbnailOverlays" when it doesn't. More testing is needed to see if this is + # actually needed + if length_container = item_contents["lengthText"]? + length_seconds = decode_length_seconds(length_container["simpleText"].as_s) + elsif length_container = item_contents["thumbnailOverlays"]?.try &.as_a.find(&.["thumbnailOverlayTimeStatusRenderer"]?) + length_seconds = extract_text(length_container["thumbnailOverlayTimeStatusRenderer"]["text"]).try { |t| decode_length_seconds(t) } || 0 + else + length_seconds = 0 + end + + live_now = false + paid = false + premium = false + + premiere_timestamp = item_contents.dig?("upcomingEventData", "startTime").try { |t| Time.unix(t.as_s.to_i64) } + + item_contents["badges"]?.try &.as_a.each do |badge| + b = badge["metadataBadgeRenderer"] + case b["label"].as_s + when "LIVE NOW" + live_now = true + when "New", "4K", "CC" + # TODO + when "Premium" + # TODO: Potentially available as item_contents["topStandaloneBadge"]["metadataBadgeRenderer"] + premium = true + else nil # Ignore + end + end + + SearchVideo.new({ + title: title, + id: video_id, + author: author, + ucid: author_id, + published: published, + views: view_count, + description_html: description_html, + length_seconds: length_seconds, + live_now: live_now, + premium: premium, + premiere_timestamp: premiere_timestamp, + }) + end + end + + # Parses a InnerTube channelRenderer into a SearchChannel. Returns nil when the given object isn't a channelRenderer + # + # A channelRenderer renders a channel to click on within the YouTube and Invidious UI. It is **not** + # the channel page itself. + # + # See specs for example. + # + # `channelRenderer`s can be found almost everywhere on YouTube. In categories, search results, channels, etc. + # + module ChannelRendererParser + def self.process(item : JSON::Any, author_fallback : AuthorFallback) + if item_contents = (item["channelRenderer"]? || item["gridChannelRenderer"]?) + return self.parse(item_contents, author_fallback) + end + end + + private def self.parse(item_contents, author_fallback) + author = extract_text(item_contents["title"]) || author_fallback.name + author_id = item_contents["channelId"]?.try &.as_s || author_fallback.id + + author_thumbnail = HelperExtractors.get_thumbnails(item_contents) + # When public subscriber count is disabled, the subscriberCountText isn't sent by InnerTube. + # Always simpleText + # TODO change default value to nil + subscriber_count = item_contents.dig?("subscriberCountText", "simpleText") + .try { |s| short_text_to_number(s.as_s.split(" ")[0]) } || 0 + + # Auto-generated channels doesn't have videoCountText + # Taken from: https://github.com/iv-org/invidious/pull/2228#discussion_r717620922 + auto_generated = item_contents["videoCountText"]?.nil? + + video_count = HelperExtractors.get_video_count(item_contents) + description_html = item_contents["descriptionSnippet"]?.try { |t| parse_content(t) } || "" + + SearchChannel.new({ + author: author, + ucid: author_id, + author_thumbnail: author_thumbnail, + subscriber_count: subscriber_count, + video_count: video_count, + description_html: description_html, + auto_generated: auto_generated, + }) + end + end + + # Parses a InnerTube gridPlaylistRenderer into a SearchPlaylist. Returns nil when the given object isn't a gridPlaylistRenderer + # + # A gridPlaylistRenderer renders a playlist, that is located in a grid, to click on within the YouTube and Invidious UI. + # It is **not** the playlist itself. + # + # See specs for example. + # + # `gridPlaylistRenderer`s can be found on the playlist-tabs of channels and expanded categories. + # + module GridPlaylistRendererParser + def self.process(item : JSON::Any, author_fallback : AuthorFallback) + if item_contents = item["gridPlaylistRenderer"]? + return self.parse(item_contents, author_fallback) + end + end + + private def self.parse(item_contents, author_fallback) + title = extract_text(item_contents["title"]) || "" + plid = item_contents["playlistId"]?.try &.as_s || "" + + video_count = HelperExtractors.get_video_count(item_contents) + playlist_thumbnail = HelperExtractors.get_thumbnails(item_contents) + + SearchPlaylist.new({ + title: title, + id: plid, + author: author_fallback.name, + ucid: author_fallback.id, + video_count: video_count, + videos: [] of SearchPlaylistVideo, + thumbnail: playlist_thumbnail, + }) + end + end + + # Parses a InnerTube playlistRenderer into a SearchPlaylist. Returns nil when the given object isn't a playlistRenderer + # + # A playlistRenderer renders a playlist to click on within the YouTube and Invidious UI. It is **not** the playlist itself. + # + # See specs for example. + # + # `playlistRenderer`s can be found almost everywhere on YouTube. In categories, search results, recommended, etc. + # + module PlaylistRendererParser + def self.process(item : JSON::Any, author_fallback : AuthorFallback) + if item_contents = item["playlistRenderer"]? + return self.parse(item_contents) + end + end + + private def self.parse(item_contents) + title = item_contents["title"]["simpleText"]?.try &.as_s || "" + plid = item_contents["playlistId"]?.try &.as_s || "" + + video_count = HelperExtractors.get_video_count(item_contents) + playlist_thumbnail = HelperExtractors.get_thumbnails_plural(item_contents) + + author_info = item_contents.dig("shortBylineText", "runs", 0) + author = author_info["text"].as_s + author_id = HelperExtractors.get_browse_id(author_info) + + videos = item_contents["videos"]?.try &.as_a.map do |v| + v = v["childVideoRenderer"] + v_title = v.dig?("title", "simpleText").try &.as_s || "" + v_id = v["videoId"]?.try &.as_s || "" + v_length_seconds = v.dig?("lengthText", "simpleText").try { |t| decode_length_seconds(t.as_s) } || 0 + SearchPlaylistVideo.new({ + title: v_title, + id: v_id, + length_seconds: v_length_seconds, + }) + end || [] of SearchPlaylistVideo + + # TODO: item_contents["publishedTimeText"]? + + SearchPlaylist.new({ + title: title, + id: plid, + author: author, + ucid: author_id, + video_count: video_count, + videos: videos, + thumbnail: playlist_thumbnail, + }) + end + end + + # Parses a InnerTube shelfRenderer into a Category. Returns nil when the given object isn't a shelfRenderer + # + # A shelfRenderer renders divided sections on YouTube. IE "People also watched" in search results and + # the various organizational sections in the channel home page. A separate one (richShelfRenderer) is used + # for YouTube home. A shelfRenderer can also sometimes be expanded to show more content within it. + # + # See specs for example. + # + # `shelfRenderer`s can be found almost everywhere on YouTube. In categories, search results, channels, etc. + # + module CategoryRendererParser + def self.process(item : JSON::Any, author_fallback : AuthorFallback) + if item_contents = item["shelfRenderer"]? + return self.parse(item_contents, author_fallback) + end + end + + private def self.parse(item_contents, author_fallback) + title = extract_text(item_contents["title"]?) || "" + url = item_contents.dig?("endpoint", "commandMetadata", "webCommandMetadata", "url") + .try &.as_s + + # Sometimes a category can have badges. + badges = [] of Tuple(String, String) # (Badge style, label) + item_contents["badges"]?.try &.as_a.each do |badge| + badge = badge["metadataBadgeRenderer"] + badges << {badge["style"].as_s, badge["label"].as_s} + end + + # Category description + description_html = item_contents["subtitle"]?.try { |desc| parse_content(desc) } || "" + + # Content parsing + contents = [] of SearchItem + + # Content could be in three locations. + if content_container = item_contents["content"]["horizontalListRenderer"]? + elsif content_container = item_contents["content"]["expandedShelfContentsRenderer"]? + elsif content_container = item_contents["content"]["verticalListRenderer"]? + else + content_container = item_contents["contents"] + end + + raw_contents = content_container["items"].as_a + raw_contents.each do |item| + result = extract_item(item) + if !result.nil? + contents << result + end + end + + Category.new({ + title: title, + contents: contents, + description_html: description_html, + url: url, + badges: badges, + }) + end + end +end + +# The following are the extractors for extracting an array of items from +# the internal Youtube API's JSON response. The result is then packaged into +# a structure we can more easily use via the parsers above. Their internals are +# identical to the item parsers. + +# Namespace for logic relating to extracting InnerTube's initial response to items we can parse. +# +# Each of the extractors in this namespace are accessed through the #process() method +# which validates the given data as applicable to itself. If it is applicable the given +# data is passed to the private `#extract()` method which returns an array of +# parsable items. Otherwise, nil is returned. +# +# NOTE perhaps the result from here should be abstracted into a struct in order to +# get additional metadata regarding the container of the item(s). +private module Extractors + # Extracts items from the selected YouTube tab. + # + # YouTube tabs are typically stored under "twoColumnBrowseResultsRenderer" + # and is structured like this: + # + # "twoColumnBrowseResultsRenderer": { + # {"tabs": [ + # {"tabRenderer": { + # "endpoint": {...} + # "title": "Playlists", + # "selected": true, + # "content": {...}, + # ... + # }} + # ]} + # }] + # + module YouTubeTabs + def self.process(initial_data : Hash(String, JSON::Any)) + if target = initial_data["twoColumnBrowseResultsRenderer"]? + self.extract(target) + end + end + + private def self.extract(target) + raw_items = [] of JSON::Any + content = extract_selected_tab(target["tabs"])["content"] + + content["sectionListRenderer"]["contents"].as_a.each do |renderer_container| + renderer_container_contents = renderer_container["itemSectionRenderer"]["contents"][0] + + # Category extraction + if items_container = renderer_container_contents["shelfRenderer"]? + raw_items << renderer_container_contents + next + elsif items_container = renderer_container_contents["gridRenderer"]? + else + items_container = renderer_container_contents + end + + items_container["items"].as_a.each do |item| + raw_items << item + end + end + + return raw_items + end + end + + # Extracts items from the InnerTube response for search results + # + # Search results are typically stored under "twoColumnSearchResultsRenderer" + # and is structured like this: + # + # "twoColumnSearchResultsRenderer": { + # {"primaryContents": { + # {"sectionListRenderer": { + # "contents": [...], + # ..., + # "subMenu": {...}, + # "hideBottomSeparator": true, + # "targetId": "search-feed" + # }} + # }} + # } + # + module SearchResults + def self.process(initial_data : Hash(String, JSON::Any)) + if target = initial_data["twoColumnSearchResultsRenderer"]? + self.extract(target) + end + end + + private def self.extract(target) + raw_items = [] of Array(JSON::Any) + + target.dig("primaryContents", "sectionListRenderer", "contents").as_a.each do |node| + if node = node["itemSectionRenderer"]? + raw_items << node["contents"].as_a + end + end + + return raw_items.flatten + end + end + + # Extracts continuation items from a InnerTube response + # + # Continuation items (on YouTube) are items which are appended to the + # end of the page for continuous scrolling. As such, in many cases, + # the items are lacking information such as author or category title, + # since the original results has already rendered them on the top of the page. + # + # The way they are structured is too varied to be accurately written down here. + # However, they all eventually lead to an array of parsable items after traversing + # through the JSON structure. + module Continuation + def self.process(initial_data : Hash(String, JSON::Any)) + if target = initial_data["continuationContents"]? + self.extract(target) + elsif target = initial_data["appendContinuationItemsAction"]? + self.extract(target) + end + end + + private def self.extract(target) + raw_items = [] of JSON::Any + if content = target["gridContinuation"]? + raw_items = content["items"].as_a + elsif content = target["continuationItems"]? + raw_items = content.as_a + end + + return raw_items + end + end +end + +# Helper methods to aid in the parsing of InnerTube to data structs. +# +# Mostly used to extract out repeated structures to deal with code +# repetition. +private module HelperExtractors + # Retrieves the amount of videos present within the given InnerTube data. + # + # Returns a 0 when it's unable to do so + def self.get_video_count(container : JSON::Any) : Int32 + if box = container["videoCountText"]? + return extract_text(box).try &.gsub(/\D/, "").to_i || 0 + elsif box = container["videoCount"]? + return box.as_s.to_i + else + return 0 + end + end + + # Retrieve lowest quality thumbnail from InnerTube data + # + # TODO allow configuration of image quality (-1 is highest) + # + # Raises when it's unable to parse from the given JSON data. + def self.get_thumbnails(container : JSON::Any) : String + return container.dig("thumbnail", "thumbnails", 0, "url").as_s + end + + # ditto + # + # YouTube sometimes sends the thumbnail as: + # {"thumbnails": [{"thumbnails": [{"url": "example.com"}, ...]}]} + def self.get_thumbnails_plural(container : JSON::Any) : String + return container.dig("thumbnails", 0, "thumbnails", 0, "url").as_s + end + + # Retrieves the ID required for querying the InnerTube browse endpoint. + # Raises when it's unable to do so + def self.get_browse_id(container) + return container.dig("navigationEndpoint", "browseEndpoint", "browseId").as_s + end +end + +# Extracts text from InnerTube response +# +# InnerTube can package text in three different formats +# "runs": [ +# {"text": "something"}, +# {"text": "cont"}, +# ... +# ] +# +# "SimpleText": "something" +# +# Or sometimes just none at all as with the data returned from +# category continuations. +# +# In order to facilitate calling this function with `#[]?`: +# A nil will be accepted. Of course, since nil cannot be parsed, +# another nil will be returned. +def extract_text(item : JSON::Any?) : String? + if item.nil? + return nil + end + + if text_container = item["simpleText"]? + return text_container.as_s + elsif text_container = item["runs"]? + return text_container.as_a.map(&.["text"].as_s).join("") + else + nil + end +end + +# Parses an item from Youtube's JSON response into a more usable structure. +# The end result can either be a SearchVideo, SearchPlaylist or SearchChannel. +def extract_item(item : JSON::Any, author_fallback : String? = "", + author_id_fallback : String? = "") + # We "allow" nil values but secretly use empty strings instead. This is to save us the + # hassle of modifying every author_fallback and author_id_fallback arg usage + # which is more often than not nil. + author_fallback = AuthorFallback.new(author_fallback || "", author_id_fallback || "") + + # Cycles through all of the item parsers and attempt to parse the raw YT JSON data. + # Each parser automatically validates the data given to see if the data is + # applicable to itself. If not nil is returned and the next parser is attemped. + ITEM_PARSERS.each do |parser| + if result = parser.process(item, author_fallback) + return result + end + end +end + +# Parses multiple items from YouTube's initial JSON response into a more usable structure. +# The end result is an array of SearchItem. +def extract_items(initial_data : Hash(String, JSON::Any), author_fallback : String? = nil, + author_id_fallback : String? = nil) : Array(SearchItem) + items = [] of SearchItem + + if unpackaged_data = initial_data["contents"]?.try &.as_h + elsif unpackaged_data = initial_data["response"]?.try &.as_h + elsif unpackaged_data = initial_data.dig?("onResponseReceivedActions", 0).try &.as_h + else + unpackaged_data = initial_data + end + + # This is identical to the parser cycling of extract_item(). + ITEM_CONTAINER_EXTRACTOR.each do |extractor| + if container = extractor.process(unpackaged_data) + # Extract items in container + container.each do |item| + if parsed_result = extract_item(item, author_fallback, author_id_fallback) + items << parsed_result + end + end + + break + end + end + + return items +end diff --git a/src/invidious/helpers/helpers.cr b/src/invidious/helpers/helpers.cr index fb33df1c..99adcd30 100644 --- a/src/invidious/helpers/helpers.cr +++ b/src/invidious/helpers/helpers.cr @@ -248,168 +248,40 @@ def html_to_content(description_html : String) end def extract_videos(initial_data : Hash(String, JSON::Any), author_fallback : String? = nil, author_id_fallback : String? = nil) - extract_items(initial_data, author_fallback, author_id_fallback).select(&.is_a?(SearchVideo)).map(&.as(SearchVideo)) -end + extracted = extract_items(initial_data, author_fallback, author_id_fallback) -def extract_item(item : JSON::Any, author_fallback : String? = nil, author_id_fallback : String? = nil) - if i = (item["videoRenderer"]? || item["gridVideoRenderer"]?) - video_id = i["videoId"].as_s - title = i["title"].try { |t| t["simpleText"]?.try &.as_s || t["runs"]?.try &.as_a.map(&.["text"].as_s).join("") } || "" - - author_info = i["ownerText"]?.try &.["runs"]?.try &.as_a?.try &.[0]? - author = author_info.try &.["text"].as_s || author_fallback || "" - author_id = author_info.try &.["navigationEndpoint"]?.try &.["browseEndpoint"]["browseId"].as_s || author_id_fallback || "" - - published = i["publishedTimeText"]?.try &.["simpleText"]?.try { |t| decode_date(t.as_s) } || Time.local - view_count = i["viewCountText"]?.try &.["simpleText"]?.try &.as_s.gsub(/\D+/, "").to_i64? || 0_i64 - description_html = i["descriptionSnippet"]?.try { |t| parse_content(t) } || "" - length_seconds = i["lengthText"]?.try &.["simpleText"]?.try &.as_s.try { |t| decode_length_seconds(t) } || - i["thumbnailOverlays"]?.try &.as_a.find(&.["thumbnailOverlayTimeStatusRenderer"]?).try &.["thumbnailOverlayTimeStatusRenderer"]? - .try &.["text"]?.try &.["simpleText"]?.try &.as_s.try { |t| decode_length_seconds(t) } || 0 - - live_now = false - premium = false - - premiere_timestamp = i["upcomingEventData"]?.try &.["startTime"]?.try { |t| Time.unix(t.as_s.to_i64) } - - i["badges"]?.try &.as_a.each do |badge| - b = badge["metadataBadgeRenderer"] - case b["label"].as_s - when "LIVE NOW" - live_now = true - when "New", "4K", "CC" - # TODO - when "Premium" - # TODO: Potentially available as i["topStandaloneBadge"]["metadataBadgeRenderer"] - premium = true - else nil # Ignore - end + target = [] of SearchItem + extracted.each do |i| + if i.is_a?(Category) + i.contents.each { |cate_i| target << cate_i if !cate_i.is_a? Video } + else + target << i end - - SearchVideo.new({ - title: title, - id: video_id, - author: author, - ucid: author_id, - published: published, - views: view_count, - description_html: description_html, - length_seconds: length_seconds, - live_now: live_now, - premium: premium, - premiere_timestamp: premiere_timestamp, - }) - elsif i = item["channelRenderer"]? - author = i["title"]["simpleText"]?.try &.as_s || author_fallback || "" - author_id = i["channelId"]?.try &.as_s || author_id_fallback || "" - - author_thumbnail = i["thumbnail"]["thumbnails"]?.try &.as_a[0]?.try &.["url"]?.try &.as_s || "" - subscriber_count = i["subscriberCountText"]?.try &.["simpleText"]?.try &.as_s.try { |s| short_text_to_number(s.split(" ")[0]) } || 0 - - auto_generated = false - auto_generated = true if !i["videoCountText"]? - video_count = i["videoCountText"]?.try &.["runs"].as_a[0]?.try &.["text"].as_s.gsub(/\D/, "").to_i || 0 - description_html = i["descriptionSnippet"]?.try { |t| parse_content(t) } || "" - - SearchChannel.new({ - author: author, - ucid: author_id, - author_thumbnail: author_thumbnail, - subscriber_count: subscriber_count, - video_count: video_count, - description_html: description_html, - auto_generated: auto_generated, - }) - elsif i = item["gridPlaylistRenderer"]? - title = i["title"]["runs"].as_a[0]?.try &.["text"].as_s || "" - plid = i["playlistId"]?.try &.as_s || "" - - video_count = i["videoCountText"]["runs"].as_a[0]?.try &.["text"].as_s.gsub(/\D/, "").to_i || 0 - playlist_thumbnail = i["thumbnail"]["thumbnails"][0]?.try &.["url"]?.try &.as_s || "" - - SearchPlaylist.new({ - title: title, - id: plid, - author: author_fallback || "", - ucid: author_id_fallback || "", - video_count: video_count, - videos: [] of SearchPlaylistVideo, - thumbnail: playlist_thumbnail, - }) - elsif i = item["playlistRenderer"]? - title = i["title"]["simpleText"]?.try &.as_s || "" - plid = i["playlistId"]?.try &.as_s || "" - - video_count = i["videoCount"]?.try &.as_s.to_i || 0 - playlist_thumbnail = i["thumbnails"].as_a[0]?.try &.["thumbnails"]?.try &.as_a[0]?.try &.["url"].as_s || "" - - author_info = i["shortBylineText"]?.try &.["runs"]?.try &.as_a?.try &.[0]? - author = author_info.try &.["text"].as_s || author_fallback || "" - author_id = author_info.try &.["navigationEndpoint"]?.try &.["browseEndpoint"]["browseId"].as_s || author_id_fallback || "" - - videos = i["videos"]?.try &.as_a.map do |v| - v = v["childVideoRenderer"] - v_title = v["title"]["simpleText"]?.try &.as_s || "" - v_id = v["videoId"]?.try &.as_s || "" - v_length_seconds = v["lengthText"]?.try &.["simpleText"]?.try { |t| decode_length_seconds(t.as_s) } || 0 - SearchPlaylistVideo.new({ - title: v_title, - id: v_id, - length_seconds: v_length_seconds, - }) - end || [] of SearchPlaylistVideo - - # TODO: i["publishedTimeText"]? - - SearchPlaylist.new({ - title: title, - id: plid, - author: author, - ucid: author_id, - video_count: video_count, - videos: videos, - thumbnail: playlist_thumbnail, - }) - elsif i = item["radioRenderer"]? # Mix - # TODO - elsif i = item["showRenderer"]? # Show - # TODO - elsif i = item["shelfRenderer"]? - elsif i = item["horizontalCardListRenderer"]? - elsif i = item["searchPyvRenderer"]? # Ad end + return target.select(&.is_a?(SearchVideo)).map(&.as(SearchVideo)) end -def extract_items(initial_data : Hash(String, JSON::Any), author_fallback : String? = nil, author_id_fallback : String? = nil) - items = [] of SearchItem +def extract_selected_tab(tabs) + # Extract the selected tab from the array of tabs Youtube returns + return selected_target = tabs.as_a.select(&.["tabRenderer"]?.try &.["selected"].as_bool)[0]["tabRenderer"] +end - channel_v2_response = initial_data - .try &.["continuationContents"]? - .try &.["gridContinuation"]? - .try &.["items"]? +def fetch_continuation_token(items : Array(JSON::Any)) + # Fetches the continuation token from an array of items + return items.last["continuationItemRenderer"]? + .try &.["continuationEndpoint"]["continuationCommand"]["token"].as_s +end - if channel_v2_response - channel_v2_response.try &.as_a.each { |item| - extract_item(item, author_fallback, author_id_fallback) - .try { |t| items << t } - } +def fetch_continuation_token(initial_data : Hash(String, JSON::Any)) + # Fetches the continuation token from initial data + if initial_data["onResponseReceivedActions"]? + continuation_items = initial_data["onResponseReceivedActions"][0]["appendContinuationItemsAction"]["continuationItems"] else - initial_data.try { |t| t["contents"]? || t["response"]? } - .try { |t| t["twoColumnBrowseResultsRenderer"]?.try &.["tabs"].as_a.select(&.["tabRenderer"]?.try &.["selected"].as_bool)[0]?.try &.["tabRenderer"]["content"] || - t["twoColumnSearchResultsRenderer"]?.try &.["primaryContents"] || - t["continuationContents"]? } - .try { |t| t["sectionListRenderer"]? || t["sectionListContinuation"]? } - .try &.["contents"].as_a - .each { |c| c.try &.["itemSectionRenderer"]?.try &.["contents"].as_a - .try { |t| t[0]?.try &.["shelfRenderer"]?.try &.["content"]["expandedShelfContentsRenderer"]?.try &.["items"].as_a || - t[0]?.try &.["gridRenderer"]?.try &.["items"].as_a || t } - .each { |item| - extract_item(item, author_fallback, author_id_fallback) - .try { |t| items << t } - } } + tab = extract_selected_tab(initial_data["contents"]["twoColumnBrowseResultsRenderer"]["tabs"]) + continuation_items = tab["content"]["sectionListRenderer"]["contents"][0]["itemSectionRenderer"]["contents"][0]["gridRenderer"]["items"] end - items + return fetch_continuation_token(continuation_items.as_a) end def check_enum(db, enum_name, struct_type = nil) diff --git a/src/invidious/helpers/i18n.cr b/src/invidious/helpers/i18n.cr index 7ffdfdcc..2ed4f150 100644 --- a/src/invidious/helpers/i18n.cr +++ b/src/invidious/helpers/i18n.cr @@ -1,43 +1,44 @@ +# "bn_BD" => load_locale("bn_BD"), # Bengali (Bangladesh) [Incomplete] +# "eu" => load_locale("eu"), # Basque [Incomplete] +# "si" => load_locale("si"), # Sinhala [Incomplete] +# "sk" => load_locale("sk"), # Slovak [Incomplete] +# "sr" => load_locale("sr"), # Serbian [Incomplete] +# "sr_Cyrl" => load_locale("sr_Cyrl"), # Serbian (cyrillic) [Incomplete] LOCALES = { - "ar" => load_locale("ar"), # Arabic - "bn_BD" => load_locale("bn_BD"), # Bengali (Bangladesh) - "cs" => load_locale("cs"), # Czech - "da" => load_locale("da"), # Danish - "de" => load_locale("de"), # German - "el" => load_locale("el"), # Greek - "en-US" => load_locale("en-US"), # English (US) - "eo" => load_locale("eo"), # Esperanto - "es" => load_locale("es"), # Spanish - "eu" => load_locale("eu"), # Basque - "fa" => load_locale("fa"), # Persian - "fi" => load_locale("fi"), # Finnish - "fr" => load_locale("fr"), # French - "he" => load_locale("he"), # Hebrew - "hr" => load_locale("hr"), # Croatian - "hu-HU" => load_locale("hu-HU"), # Hungarian - "id" => load_locale("id"), # Indonesian - "is" => load_locale("is"), # Icelandic - "it" => load_locale("it"), # Italian - "ja" => load_locale("ja"), # Japanese - "ko" => load_locale("ko"), # Korean - "lt" => load_locale("lt"), # Lithuanian - "nb-NO" => load_locale("nb-NO"), # Norwegian Bokmål - "nl" => load_locale("nl"), # Dutch - "pl" => load_locale("pl"), # Polish - "pt-BR" => load_locale("pt-BR"), # Portuguese (Brazil) - "pt-PT" => load_locale("pt-PT"), # Portuguese (Portugal) - "ro" => load_locale("ro"), # Romanian - "ru" => load_locale("ru"), # Russian - "si" => load_locale("si"), # Sinhala - "sk" => load_locale("sk"), # Slovak - "sr" => load_locale("sr"), # Serbian - "sr_Cyrl" => load_locale("sr_Cyrl"), # Serbian (cyrillic) - "sv-SE" => load_locale("sv-SE"), # Swedish - "tr" => load_locale("tr"), # Turkish - "uk" => load_locale("uk"), # Ukrainian - "vi" => load_locale("vi"), # Vietnamese - "zh-CN" => load_locale("zh-CN"), # Chinese (Simplified) - "zh-TW" => load_locale("zh-TW"), # Chinese (Traditional) + "ar" => load_locale("ar"), # Arabic + "cs" => load_locale("cs"), # Czech + "da" => load_locale("da"), # Danish + "de" => load_locale("de"), # German + "el" => load_locale("el"), # Greek + "en-US" => load_locale("en-US"), # English (US) + "eo" => load_locale("eo"), # Esperanto + "es" => load_locale("es"), # Spanish + "fa" => load_locale("fa"), # Persian + "fi" => load_locale("fi"), # Finnish + "fr" => load_locale("fr"), # French + "he" => load_locale("he"), # Hebrew + "hr" => load_locale("hr"), # Croatian + "hu-HU" => load_locale("hu-HU"), # Hungarian + "id" => load_locale("id"), # Indonesian + "is" => load_locale("is"), # Icelandic + "it" => load_locale("it"), # Italian + "ja" => load_locale("ja"), # Japanese + "ko" => load_locale("ko"), # Korean + "lt" => load_locale("lt"), # Lithuanian + "nb-NO" => load_locale("nb-NO"), # Norwegian Bokmål + "nl" => load_locale("nl"), # Dutch + "pl" => load_locale("pl"), # Polish + "pt" => load_locale("pt"), # Portuguese + "pt-BR" => load_locale("pt-BR"), # Portuguese (Brazil) + "pt-PT" => load_locale("pt-PT"), # Portuguese (Portugal) + "ro" => load_locale("ro"), # Romanian + "ru" => load_locale("ru"), # Russian + "sv-SE" => load_locale("sv-SE"), # Swedish + "tr" => load_locale("tr"), # Turkish + "uk" => load_locale("uk"), # Ukrainian + "vi" => load_locale("vi"), # Vietnamese + "zh-CN" => load_locale("zh-CN"), # Chinese (Simplified) + "zh-TW" => load_locale("zh-TW"), # Chinese (Traditional) } def load_locale(name) diff --git a/src/invidious/helpers/serialized_yt_data.cr b/src/invidious/helpers/serialized_yt_data.cr new file mode 100644 index 00000000..61356555 --- /dev/null +++ b/src/invidious/helpers/serialized_yt_data.cr @@ -0,0 +1,256 @@ +struct SearchVideo + include DB::Serializable + + property title : String + property id : String + property author : String + property ucid : String + property published : Time + property views : Int64 + property description_html : String + property length_seconds : Int32 + property live_now : Bool + property premium : Bool + property premiere_timestamp : Time? + + def to_xml(auto_generated, query_params, xml : XML::Builder) + query_params["v"] = self.id + + xml.element("entry") do + xml.element("id") { xml.text "yt:video:#{self.id}" } + xml.element("yt:videoId") { xml.text self.id } + xml.element("yt:channelId") { xml.text self.ucid } + xml.element("title") { xml.text self.title } + xml.element("link", rel: "alternate", href: "#{HOST_URL}/watch?#{query_params}") + + xml.element("author") do + if auto_generated + xml.element("name") { xml.text self.author } + xml.element("uri") { xml.text "#{HOST_URL}/channel/#{self.ucid}" } + else + xml.element("name") { xml.text author } + xml.element("uri") { xml.text "#{HOST_URL}/channel/#{ucid}" } + end + end + + xml.element("content", type: "xhtml") do + xml.element("div", xmlns: "http://www.w3.org/1999/xhtml") do + xml.element("a", href: "#{HOST_URL}/watch?#{query_params}") do + xml.element("img", src: "#{HOST_URL}/vi/#{self.id}/mqdefault.jpg") + end + + xml.element("p", style: "word-break:break-word;white-space:pre-wrap") { xml.text html_to_content(self.description_html) } + end + end + + xml.element("published") { xml.text self.published.to_s("%Y-%m-%dT%H:%M:%S%:z") } + + xml.element("media:group") do + xml.element("media:title") { xml.text self.title } + xml.element("media:thumbnail", url: "#{HOST_URL}/vi/#{self.id}/mqdefault.jpg", + width: "320", height: "180") + xml.element("media:description") { xml.text html_to_content(self.description_html) } + end + + xml.element("media:community") do + xml.element("media:statistics", views: self.views) + end + end + end + + def to_xml(auto_generated, query_params, xml : XML::Builder | Nil = nil) + if xml + to_xml(HOST_URL, auto_generated, query_params, xml) + else + XML.build do |json| + to_xml(HOST_URL, auto_generated, query_params, xml) + end + end + end + + def to_json(locale : Hash(String, JSON::Any), json : JSON::Builder) + json.object do + json.field "type", "video" + json.field "title", self.title + json.field "videoId", self.id + + json.field "author", self.author + json.field "authorId", self.ucid + json.field "authorUrl", "/channel/#{self.ucid}" + + json.field "videoThumbnails" do + generate_thumbnails(json, self.id) + end + + json.field "description", html_to_content(self.description_html) + json.field "descriptionHtml", self.description_html + + json.field "viewCount", self.views + json.field "published", self.published.to_unix + json.field "publishedText", translate(locale, "`x` ago", recode_date(self.published, locale)) + json.field "lengthSeconds", self.length_seconds + json.field "liveNow", self.live_now + json.field "premium", self.premium + json.field "isUpcoming", self.is_upcoming + + if self.premiere_timestamp + json.field "premiereTimestamp", self.premiere_timestamp.try &.to_unix + end + end + end + + def to_json(locale, json : JSON::Builder | Nil = nil) + if json + to_json(locale, json) + else + JSON.build do |json| + to_json(locale, json) + end + end + end + + def is_upcoming + premiere_timestamp ? true : false + end +end + +struct SearchPlaylistVideo + include DB::Serializable + + property title : String + property id : String + property length_seconds : Int32 +end + +struct SearchPlaylist + include DB::Serializable + + property title : String + property id : String + property author : String + property ucid : String + property video_count : Int32 + property videos : Array(SearchPlaylistVideo) + property thumbnail : String? + + def to_json(locale, json : JSON::Builder) + json.object do + json.field "type", "playlist" + json.field "title", self.title + json.field "playlistId", self.id + json.field "playlistThumbnail", self.thumbnail + + json.field "author", self.author + json.field "authorId", self.ucid + json.field "authorUrl", "/channel/#{self.ucid}" + + json.field "videoCount", self.video_count + json.field "videos" do + json.array do + self.videos.each do |video| + json.object do + json.field "title", video.title + json.field "videoId", video.id + json.field "lengthSeconds", video.length_seconds + + json.field "videoThumbnails" do + generate_thumbnails(json, video.id) + end + end + end + end + end + end + end + + def to_json(locale, json : JSON::Builder | Nil = nil) + if json + to_json(locale, json) + else + JSON.build do |json| + to_json(locale, json) + end + end + end +end + +struct SearchChannel + include DB::Serializable + + property author : String + property ucid : String + property author_thumbnail : String + property subscriber_count : Int32 + property video_count : Int32 + property description_html : String + property auto_generated : Bool + + def to_json(locale, json : JSON::Builder) + json.object do + json.field "type", "channel" + json.field "author", self.author + json.field "authorId", self.ucid + json.field "authorUrl", "/channel/#{self.ucid}" + + json.field "authorThumbnails" do + json.array do + qualities = {32, 48, 76, 100, 176, 512} + + qualities.each do |quality| + json.object do + json.field "url", self.author_thumbnail.gsub(/=\d+/, "=s#{quality}") + json.field "width", quality + json.field "height", quality + end + end + end + end + + json.field "autoGenerated", self.auto_generated + json.field "subCount", self.subscriber_count + json.field "videoCount", self.video_count + + json.field "description", html_to_content(self.description_html) + json.field "descriptionHtml", self.description_html + end + end + + def to_json(locale, json : JSON::Builder | Nil = nil) + if json + to_json(locale, json) + else + JSON.build do |json| + to_json(locale, json) + end + end + end +end + +class Category + include DB::Serializable + + property title : String + property contents : Array(SearchItem) | Array(Video) + property url : String? + property description_html : String + property badges : Array(Tuple(String, String))? + + def to_json(locale, json : JSON::Builder) + json.object do + json.field "title", self.title + json.field "contents", self.contents + end + end + + def to_json(locale, json : JSON::Builder | Nil = nil) + if json + to_json(locale, json) + else + JSON.build do |json| + to_json(locale, json) + end + end + end +end + +alias SearchItem = SearchVideo | SearchChannel | SearchPlaylist | Category diff --git a/src/invidious/search.cr b/src/invidious/search.cr index a3fcc7a3..d95d802e 100644 --- a/src/invidious/search.cr +++ b/src/invidious/search.cr @@ -1,233 +1,3 @@ -struct SearchVideo - include DB::Serializable - - property title : String - property id : String - property author : String - property ucid : String - property published : Time - property views : Int64 - property description_html : String - property length_seconds : Int32 - property live_now : Bool - property premium : Bool - property premiere_timestamp : Time? - - def to_xml(auto_generated, query_params, xml : XML::Builder) - query_params["v"] = self.id - - xml.element("entry") do - xml.element("id") { xml.text "yt:video:#{self.id}" } - xml.element("yt:videoId") { xml.text self.id } - xml.element("yt:channelId") { xml.text self.ucid } - xml.element("title") { xml.text self.title } - xml.element("link", rel: "alternate", href: "#{HOST_URL}/watch?#{query_params}") - - xml.element("author") do - if auto_generated - xml.element("name") { xml.text self.author } - xml.element("uri") { xml.text "#{HOST_URL}/channel/#{self.ucid}" } - else - xml.element("name") { xml.text author } - xml.element("uri") { xml.text "#{HOST_URL}/channel/#{ucid}" } - end - end - - xml.element("content", type: "xhtml") do - xml.element("div", xmlns: "http://www.w3.org/1999/xhtml") do - xml.element("a", href: "#{HOST_URL}/watch?#{query_params}") do - xml.element("img", src: "#{HOST_URL}/vi/#{self.id}/mqdefault.jpg") - end - - xml.element("p", style: "word-break:break-word;white-space:pre-wrap") { xml.text html_to_content(self.description_html) } - end - end - - xml.element("published") { xml.text self.published.to_s("%Y-%m-%dT%H:%M:%S%:z") } - - xml.element("media:group") do - xml.element("media:title") { xml.text self.title } - xml.element("media:thumbnail", url: "#{HOST_URL}/vi/#{self.id}/mqdefault.jpg", - width: "320", height: "180") - xml.element("media:description") { xml.text html_to_content(self.description_html) } - end - - xml.element("media:community") do - xml.element("media:statistics", views: self.views) - end - end - end - - def to_xml(auto_generated, query_params, xml : XML::Builder | Nil = nil) - if xml - to_xml(HOST_URL, auto_generated, query_params, xml) - else - XML.build do |json| - to_xml(HOST_URL, auto_generated, query_params, xml) - end - end - end - - def to_json(locale, json : JSON::Builder) - json.object do - json.field "type", "video" - json.field "title", self.title - json.field "videoId", self.id - - json.field "author", self.author - json.field "authorId", self.ucid - json.field "authorUrl", "/channel/#{self.ucid}" - - json.field "videoThumbnails" do - generate_thumbnails(json, self.id) - end - - json.field "description", html_to_content(self.description_html) - json.field "descriptionHtml", self.description_html - - json.field "viewCount", self.views - json.field "published", self.published.to_unix - json.field "publishedText", translate(locale, "`x` ago", recode_date(self.published, locale)) - json.field "lengthSeconds", self.length_seconds - json.field "liveNow", self.live_now - json.field "premium", self.premium - json.field "isUpcoming", self.is_upcoming - - if self.premiere_timestamp - json.field "premiereTimestamp", self.premiere_timestamp.try &.to_unix - end - end - end - - def to_json(locale, json : JSON::Builder | Nil = nil) - if json - to_json(locale, json) - else - JSON.build do |json| - to_json(locale, json) - end - end - end - - def is_upcoming - premiere_timestamp ? true : false - end -end - -struct SearchPlaylistVideo - include DB::Serializable - - property title : String - property id : String - property length_seconds : Int32 -end - -struct SearchPlaylist - include DB::Serializable - - property title : String - property id : String - property author : String - property ucid : String - property video_count : Int32 - property videos : Array(SearchPlaylistVideo) - property thumbnail : String? - - def to_json(locale, json : JSON::Builder) - json.object do - json.field "type", "playlist" - json.field "title", self.title - json.field "playlistId", self.id - json.field "playlistThumbnail", self.thumbnail - - json.field "author", self.author - json.field "authorId", self.ucid - json.field "authorUrl", "/channel/#{self.ucid}" - - json.field "videoCount", self.video_count - json.field "videos" do - json.array do - self.videos.each do |video| - json.object do - json.field "title", video.title - json.field "videoId", video.id - json.field "lengthSeconds", video.length_seconds - - json.field "videoThumbnails" do - generate_thumbnails(json, video.id) - end - end - end - end - end - end - end - - def to_json(locale, json : JSON::Builder | Nil = nil) - if json - to_json(locale, json) - else - JSON.build do |json| - to_json(locale, json) - end - end - end -end - -struct SearchChannel - include DB::Serializable - - property author : String - property ucid : String - property author_thumbnail : String - property subscriber_count : Int32 - property video_count : Int32 - property description_html : String - property auto_generated : Bool - - def to_json(locale, json : JSON::Builder) - json.object do - json.field "type", "channel" - json.field "author", self.author - json.field "authorId", self.ucid - json.field "authorUrl", "/channel/#{self.ucid}" - - json.field "authorThumbnails" do - json.array do - qualities = {32, 48, 76, 100, 176, 512} - - qualities.each do |quality| - json.object do - json.field "url", self.author_thumbnail.gsub(/=\d+/, "=s#{quality}") - json.field "width", quality - json.field "height", quality - end - end - end - end - - json.field "autoGenerated", self.auto_generated - json.field "subCount", self.subscriber_count - json.field "videoCount", self.video_count - - json.field "description", html_to_content(self.description_html) - json.field "descriptionHtml", self.description_html - end - end - - def to_json(locale, json : JSON::Builder | Nil = nil) - if json - to_json(locale, json) - else - JSON.build do |json| - to_json(locale, json) - end - end - end -end - -alias SearchItem = SearchVideo | SearchChannel | SearchPlaylist - def channel_search(query, page, channel) response = YT_POOL.client &.get("/channel/#{channel}") @@ -462,5 +232,20 @@ def process_search_query(query, page, user, region) count, items = search(search_query, search_params, region).as(Tuple) end - {search_query, count, items, operators} + # Light processing to flatten search results out of Categories. + # They should ideally be supported in the future. + items_without_category = [] of SearchItem | ChannelVideo + items.each do |i| + if i.is_a? Category + i.contents.each do |nest_i| + if !nest_i.is_a? Video + items_without_category << nest_i + end + end + else + items_without_category << i + end + end + + {search_query, items_without_category.size, items_without_category, operators} end diff --git a/src/invidious/videos.cr b/src/invidious/videos.cr index d9c07142..0e6bd77c 100644 --- a/src/invidious/videos.cr +++ b/src/invidious/videos.cr @@ -275,7 +275,7 @@ struct Video end end - def to_json(locale, json : JSON::Builder) + def to_json(locale : Hash(String, JSON::Any), json : JSON::Builder) json.object do json.field "type", "video" diff --git a/src/invidious/views/components/item.ecr b/src/invidious/views/components/item.ecr index 3391bd17..84da1091 100644 --- a/src/invidious/views/components/item.ecr +++ b/src/invidious/views/components/item.ecr @@ -109,6 +109,7 @@ </div> <% end %> </div> + <% when Category %> <% else %> <a style="width:100%" href="/watch?v=<%= item.id %>"> <% if !env.get("preferences").as(Preferences).thin_mode %> |