Skip to content

Commit

Permalink
Merge pull request #95 from vitalygashkov/next
Browse files Browse the repository at this point in the history
Added version output in debug log, added ffmpeg debug logging, improved log message if mux/decryption failed
  • Loading branch information
vitalygashkov authored Mar 25, 2024
2 parents 039ef2f + b5700ed commit 2d1c6b6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 23 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jobs:
runs-on: windows-latest
steps:
- name: Clone repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.CONTROL_REPO_TOKEN }}
submodules: recursive

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
Expand Down Expand Up @@ -49,13 +49,13 @@ jobs:
runs-on: macos-latest
steps:
- name: Clone repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.CONTROL_REPO_TOKEN }}
submodules: recursive

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
Expand Down Expand Up @@ -92,19 +92,19 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Clone repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.CONTROL_REPO_TOKEN }}
submodules: recursive

- name: Install Node.js
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
- run: git config --global url."https://${{ secrets.CONTROL_REPO_TOKEN }}@github.com/".insteadOf ssh://[email protected]/

- name: Install app dependencies
- name: Install dependencies
run: npm ci

- name: Get package name and version
Expand Down Expand Up @@ -132,13 +132,13 @@ jobs:
needs: [build-win, build-macos, build-linux]
steps:
- name: Clone repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
token: ${{ secrets.CONTROL_REPO_TOKEN }}
submodules: recursive

- name: Install Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20
cache: 'npm'
Expand Down
11 changes: 1 addition & 10 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,25 +21,16 @@ Streamyx is a command-line tool that allows you to download videos from streamin

### Prerequisites

The following dependencies are required and should be downloaded and placed in `files` folder.

- **[FFmpeg](https://ffmpeg.org/download.html)**
- **[Shaka Packager](https://github.com/shaka-project/shaka-packager/releases)**

> **Note**: FFmpeg and Shaka Packager does not affect the download, only affects the final file merge and decryption.
**Device private keys** are required for DRM-protected content and also should be placed in `files` folder.

### Install

Download build from [latest release](https://github.com/vitalygashkov/streamyx/releases/latest) (for Windows: `streamyx-win-x64.zip`), unzip, rename executable to `streamyx` and put `files` folder with all stuff next to it.
Download build from [latest release](https://github.com/vitalygashkov/streamyx/releases/latest) (for Windows: `streamyx-win-x64.zip`), unzip, and put `files` folder with all stuff next to it.

Final structure of files and folders (example for Windows):

```
/streamyx.exe
/files/ffmpeg.exe
/files/mp4decrypt.exe
/files/device_client_id_blob
/files/device_private_key
```
Expand Down
5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "streamyx",
"version": "3.8.0.beta.5",
"version": "3.8.0.beta.6",
"author": "Vitaly Gashkov <[email protected]>",
"description": "Cross-platform video downloader",
"main": "dist/src/main.js",
Expand Down Expand Up @@ -43,8 +43,7 @@
"typescript": "^5.3.3"
},
"engines": {
"node": ">=18",
"npm": ">=8"
"node": ">=20"
},
"pkg": {
"assets": [
Expand Down
2 changes: 1 addition & 1 deletion src
Submodule src updated from 9f2524 to 6e6827

0 comments on commit 2d1c6b6

Please sign in to comment.