From 8c92c634e7e54b23ce7e6eb5773ccd24f67d2089 Mon Sep 17 00:00:00 2001
From: FongMi <b8892778@gmail.com>
Date: Tue, 25 Feb 2025 21:48:43 +0800
Subject: [PATCH] Add channel number

---
 .../java/com/github/catvod/bean/live/Channel.java    |  5 +++++
 .../github/catvod/bean/{xc => xtream}/Config.java    |  2 +-
 .../github/catvod/bean/{xc => xtream}/XCategory.java |  2 +-
 .../github/catvod/bean/{xc => xtream}/XStream.java   |  2 +-
 .../java/com/github/catvod/spider/XtreamCode.java    | 12 +++++++++---
 jar/custom_spider.jar.md5                            |  2 +-
 6 files changed, 18 insertions(+), 7 deletions(-)
 rename app/src/main/java/com/github/catvod/bean/{xc => xtream}/Config.java (96%)
 rename app/src/main/java/com/github/catvod/bean/{xc => xtream}/XCategory.java (95%)
 rename app/src/main/java/com/github/catvod/bean/{xc => xtream}/XStream.java (98%)

diff --git a/app/src/main/java/com/github/catvod/bean/live/Channel.java b/app/src/main/java/com/github/catvod/bean/live/Channel.java
index 12062ec1..26fad245 100644
--- a/app/src/main/java/com/github/catvod/bean/live/Channel.java
+++ b/app/src/main/java/com/github/catvod/bean/live/Channel.java
@@ -8,6 +8,7 @@ import com.google.gson.annotations.SerializedName;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 public class Channel {
 
@@ -84,6 +85,10 @@ public class Channel {
         this.referer = referer;
     }
 
+    public void setNumber(int number) {
+        setNumber(String.format(Locale.getDefault(), "%03d", number));
+    }
+
     @Override
     public boolean equals(Object obj) {
         if (this == obj) return true;
diff --git a/app/src/main/java/com/github/catvod/bean/xc/Config.java b/app/src/main/java/com/github/catvod/bean/xtream/Config.java
similarity index 96%
rename from app/src/main/java/com/github/catvod/bean/xc/Config.java
rename to app/src/main/java/com/github/catvod/bean/xtream/Config.java
index 6abd48d9..985b2ae2 100644
--- a/app/src/main/java/com/github/catvod/bean/xc/Config.java
+++ b/app/src/main/java/com/github/catvod/bean/xtream/Config.java
@@ -1,4 +1,4 @@
-package com.github.catvod.bean.xc;
+package com.github.catvod.bean.xtream;
 
 import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
diff --git a/app/src/main/java/com/github/catvod/bean/xc/XCategory.java b/app/src/main/java/com/github/catvod/bean/xtream/XCategory.java
similarity index 95%
rename from app/src/main/java/com/github/catvod/bean/xc/XCategory.java
rename to app/src/main/java/com/github/catvod/bean/xtream/XCategory.java
index 1db2b8a6..7093f1d5 100644
--- a/app/src/main/java/com/github/catvod/bean/xc/XCategory.java
+++ b/app/src/main/java/com/github/catvod/bean/xtream/XCategory.java
@@ -1,4 +1,4 @@
-package com.github.catvod.bean.xc;
+package com.github.catvod.bean.xtream;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/com/github/catvod/bean/xc/XStream.java b/app/src/main/java/com/github/catvod/bean/xtream/XStream.java
similarity index 98%
rename from app/src/main/java/com/github/catvod/bean/xc/XStream.java
rename to app/src/main/java/com/github/catvod/bean/xtream/XStream.java
index c1e4affb..9928af72 100644
--- a/app/src/main/java/com/github/catvod/bean/xc/XStream.java
+++ b/app/src/main/java/com/github/catvod/bean/xtream/XStream.java
@@ -1,4 +1,4 @@
-package com.github.catvod.bean.xc;
+package com.github.catvod.bean.xtream;
 
 import android.text.TextUtils;
 
diff --git a/app/src/main/java/com/github/catvod/spider/XtreamCode.java b/app/src/main/java/com/github/catvod/spider/XtreamCode.java
index 64a36967..0c13a240 100644
--- a/app/src/main/java/com/github/catvod/spider/XtreamCode.java
+++ b/app/src/main/java/com/github/catvod/spider/XtreamCode.java
@@ -4,9 +4,9 @@ import android.content.Context;
 
 import com.github.catvod.bean.live.Channel;
 import com.github.catvod.bean.live.Group;
-import com.github.catvod.bean.xc.Config;
-import com.github.catvod.bean.xc.XCategory;
-import com.github.catvod.bean.xc.XStream;
+import com.github.catvod.bean.xtream.Config;
+import com.github.catvod.bean.xtream.XCategory;
+import com.github.catvod.bean.xtream.XStream;
 import com.github.catvod.crawler.Spider;
 import com.github.catvod.net.OkHttp;
 import com.google.gson.Gson;
@@ -46,6 +46,12 @@ public class XtreamCode extends Spider {
             if (!stream.getEpgChannelId().isEmpty()) channel.setTvgName(stream.getEpgChannelId());
             channel.getUrls().addAll(stream.getPlayUrl(config));
         }
+        int number = 0;
+        for (Group group : groups) {
+            for (Channel channel : group.getChannel()) {
+                if (channel.getNumber().isEmpty()) channel.setNumber(++number);
+            }
+        }
         return new Gson().toJson(groups);
     }
 
diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5
index ffbd9a63..be17c8a9 100644
--- a/jar/custom_spider.jar.md5
+++ b/jar/custom_spider.jar.md5
@@ -1 +1 @@
-90fd2379b3fb688bf7f56c442c78c6b3
+0e8190a0e9fb28163c19789d2f3642fa