Skip to content

Commit 5a28072

Browse files
Merge pull request #2909 from iptv-org/patch-2025.10.2
Patch 2025.10.2
2 parents 2f44e50 + 530db7d commit 5a28072

File tree

12 files changed

+274
-190
lines changed

12 files changed

+274
-190
lines changed

.github/workflows/format.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jobs:
3131
- name: Get list of changed *.channels.xml files
3232
id: files
3333
run: |
34-
git fetch origin master:master
3534
CHANNELS_ANY_CHANGED=false
3635
CHANNELS_ALL_CHANGED_FILES=$(git diff --diff-filter=ACMRT --name-only master -- sites/**/*.channels.xml | tr '\n' ' ')
3736
if [ -n "${CHANNELS_ALL_CHANGED_FILES}" ]; then

CONTRIBUTING.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,16 @@ module.exports = {
6666
}
6767
```
6868

69-
### Context Object
69+
### Request Context Object
7070

71-
From each function in `config.js` you can access a `context` object containing the following data:
71+
Inside `url()`, `logo()`, `request.data()`, `request.headers()` functions in `*.config.js` you can access a `context` object containing the following data:
72+
73+
- `channel`: The object describing the current channel (xmltv_id, site_id, name, lang)
74+
- `date`: The 'dayjs' instance with the requested date
75+
76+
## Parser Context Object
77+
78+
Inside `parser()` function in `*.config.js` you can access a `context` object containing the following data:
7279

7380
- `channel`: The object describing the current channel (xmltv_id, site_id, name, lang)
7481
- `date`: The 'dayjs' instance with the requested date
@@ -427,7 +434,7 @@ To run scripts use the `npm run <script-name>` command.
427434
- `api:generate`: generates a JSON file with all channels for the [iptv-org/api](https://github.com/iptv-org/api) repository.
428435
- `channels:lint`: сhecks the channel lists for syntax errors.
429436
- `channels:parse`: generates a list of channels based on the site configuration.
430-
- `channels:parse`: formats `*.channels.xml` files. The process involves removing invalid `xmltv_id`, adding missing Feed ID, and sorting the list.
437+
- `channels:format`: formats `*.channels.xml` files. The process involves removing invalid `xmltv_id`, adding missing Feed ID, and sorting the list.
431438
- `channels:edit`: utility for quick channels mapping.
432439
- `channels:validate`: checks the description of channels for errors.
433440
- `sites:init`: creates a new site config from the template.

Dockerfile

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
FROM node:22-alpine
2-
ARG GIT_REPO=https://github.com/iptv-org/epg.git
3-
ARG GIT_BRANCH=master
4-
ARG WORKDIR=/epg
5-
ENV CRON_SCHEDULE="0 0 * * *"
6-
ENV GZIP=false
7-
ENV MAX_CONNECTIONS=1
8-
ENV DAYS=
9-
ENV RUN_AT_STARTUP=true
10-
RUN apk update \
11-
&& apk upgrade --available \
12-
&& apk add curl git tzdata bash \
13-
&& npm install -g npm@latest \
14-
&& npm install pm2 -g \
15-
&& mkdir $(echo "${WORKDIR}") -p \
16-
&& cd $WORKDIR \
17-
&& git clone --depth 1 -b $(echo "${GIT_BRANCH} ${GIT_REPO}") . \
18-
&& npm install \
19-
&& mkdir /public
20-
RUN apk del git curl \
21-
&& rm -rf /var/cache/apk/*
22-
COPY pm2.config.js $WORKDIR
23-
WORKDIR $WORKDIR
24-
EXPOSE 3000
1+
FROM node:22-alpine
2+
ARG GIT_REPO=https://github.com/iptv-org/epg.git
3+
ARG GIT_BRANCH=master
4+
ARG WORKDIR=/epg
5+
ENV CRON_SCHEDULE="0 0 * * *"
6+
ENV RUN_AT_STARTUP=true
7+
RUN apk update \
8+
&& apk upgrade --available \
9+
&& apk add curl git tzdata bash \
10+
&& npm install -g npm@latest \
11+
&& npm install pm2 -g \
12+
&& mkdir $(echo "${WORKDIR}") -p \
13+
&& cd $WORKDIR \
14+
&& git clone --depth 1 -b $(echo "${GIT_BRANCH} ${GIT_REPO}") . \
15+
&& npm install \
16+
&& mkdir /public
17+
RUN apk del git curl \
18+
&& rm -rf /var/cache/apk/*
19+
COPY pm2.config.js $WORKDIR
20+
WORKDIR $WORKDIR
21+
EXPOSE 3000
2522
CMD [ "pm2-runtime", "pm2.config.js" ]

package-lock.json

Lines changed: 114 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,10 @@
7878
"consola": "^3.4.2",
7979
"cross-env": "^10.0.0",
8080
"csv-parser": "^3.2.0",
81+
"curl-generator": "^0.5.0",
8182
"cwait": "^1.1.2",
8283
"dayjs": "^1.11.13",
83-
"epg-grabber": "^0.44.0",
84+
"epg-grabber": "^0.45.0",
8485
"epg-parser": "^0.3.1",
8586
"eslint": "^9.32.0",
8687
"eslint-config-prettier": "^10.1.8",

0 commit comments

Comments
 (0)