Skip to content

Commit

Permalink
Merge pull request #137 from vitalygashkov/next
Browse files Browse the repository at this point in the history
Fix: added error handler when parsing license response as JSON
  • Loading branch information
vitalygashkov authored Apr 23, 2024
2 parents 998ad03 + 5435135 commit 25ba490
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 38 deletions.
34 changes: 18 additions & 16 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
![GitHub Downloads (all assets, latest release)](https://img.shields.io/github/downloads/vitalygashkov/streamyx/latest/total?style=flat&color=grey)
![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/vitalygashkov/streamyx/total?style=flat&color=grey)

Streamyx is a command-line tool that allows you to download videos from streaming services for offline-viewing.
Streamyx is a tool that allows you to download videos from streaming services for offline-viewing.

<div align="left">
<span>English</span> •
Expand All @@ -14,7 +14,7 @@ Streamyx is a command-line tool that allows you to download videos from streamin

## Installation

### Prerequisites
### Dependencies

**Device private keys** are required for DRM-protected content and also should be placed in `files` folder.

Expand Down Expand Up @@ -59,20 +59,22 @@ streamyx -q 720p https://wink.ru/movies/ofitsery-year-1971

Output: `/downloads/Офицеры.720p.WINK.WEB-DL.x264/Офицеры.720p.WINK.WEB-DL.x264.mkv`

## Streaming services

| Title | Status | Details |
| ---------------------------------------- | ----------- | ------------------------------------- |
| [Crunchyroll](https://crunchyroll.com/) | Supported | |
| [Kinopoisk](https://hd.kinopoisk.ru/) | Supported | |
| [IVI](https://www.ivi.ru/) | Supported | 3D movies are currently unavailable |
| [Wink](https://wink.ru/) | Supported | Live videos are currently unavailable |
| [Okko](https://okko.tv/) | Supported | |
| [KION](https://kion.ru/) | Planned | |
| [PREMIER](https://premier.one/) | Planned | |
| [START](https://start.ru/) | Planned | |
| [Amediateka](https://www.amediateka.ru/) | Planned | |
| [NTV](https://www.ntv.ru/) | In progress | Only download link extracting |
## Supported services

| Service | Downloading | Metadata | Authorization |
| --------------------------------------- | ----------- | -------- | ------------- |
| [Crunchyroll](https://crunchyroll.com/) ||||
| [Kinopoisk](https://hd.kinopoisk.ru/) ||||
| [IVI](https://www.ivi.ru/) ||||
| [Wink](https://wink.ru/) ||||
| [Okko](https://okko.tv/) ||||
| [NTV](https://www.ntv.ru/) ||||

| Emoji | Meaning |
| :---- | ------------------------- |
|| Supported |
|| Not supported |
|| Impossible / Unreasonable |

## Development

Expand Down
32 changes: 17 additions & 15 deletions docs/README.ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Streamyx - программа для скачивания контента со

## Установка

### Предварительная настройка
### Зависимости

**Приватные ключи устройства** необходимы для DRM-защищенного контента. Их следует поместить в папку `files` рядом с запускаемой утилитой.

Expand Down Expand Up @@ -57,20 +57,22 @@ streamyx -q 720p https://wink.ru/movies/ofitsery-year-1971

Результат: `/downloads/Офицеры.720p.WINK.WEB-DL.x264/Офицеры.720p.WINK.WEB-DL.x264.mkv`

## Стриминговые сервисы

| Сервис | Статус | Детали |
| ---------------------------------------- | -------------- | --------------------------------------- |
| [Crunchyroll](https://crunchyroll.com/) | Поддерживается | |
| [Кинопоиск](https://hd.kinopoisk.ru/) | Поддерживается | |
| [Иви](https://www.ivi.ru/) | Поддерживается | Скачивание 3D фильмов недоступно |
| [Wink](https://wink.ru/) | Поддерживается | Скачивание прямых трансляций недоступно |
| [Okko](https://okko.tv/) | Поддерживается | |
| [KION](https://kion.ru/) | Запланировано | |
| [PREMIER](https://premier.one/) | Запланировано | |
| [Старт](https://start.ru/) | Запланировано | |
| [Амедиатека](https://www.amediateka.ru/) | Запланировано | |
| [НТВ](https://www.ntv.ru/) | В работе | Только извлечение ссылки манифеста |
## Поддерживаемые сервисы

| Сервис | Скачивание | Метаданные | Авторизация |
| --------------------------------------- | ---------- | ---------- | ----------- |
| [Crunchyroll](https://crunchyroll.com/) ||||
| [Kinopoisk](https://hd.kinopoisk.ru/) ||||
| [IVI](https://www.ivi.ru/) ||||
| [Wink](https://wink.ru/) ||||
| [Okko](https://okko.tv/) ||||
| [NTV](https://www.ntv.ru/) ||||

| Эмодзи | Значение |
| :----- | ------------------------- |
|| Supported |
|| Not supported |
|| Impossible / Unreasonable |

## Разработка

Expand Down
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "streamyx",
"version": "4.0.0-beta.11",
"version": "4.0.0-beta.12",
"author": "Vitaly Gashkov <[email protected]>",
"description": "Cross-platform video downloader",
"main": "dist/src/main.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/dasha
2 changes: 1 addition & 1 deletion packages/esor
Submodule esor updated from ff7d05 to 7feb02
2 changes: 1 addition & 1 deletion src
Submodule src updated from a79020 to 8faad7

0 comments on commit 25ba490

Please sign in to comment.