From 3ae11bbcef1ee33778125c37f60520b413ddd5a8 Mon Sep 17 00:00:00 2001
From: Pinapelz <donaldshan1@outlook.com>
Date: Tue, 4 Apr 2023 19:45:19 -0700
Subject: Generalize Livestream class to Video class

Videos and livestreams take on the same attributes. Livestream sub class can be created if needed
---
 src/main/java/App.java                           | 10 +++++-----
 src/main/java/com/pina/Holodex.java              |  6 +++---
 src/main/java/com/pina/HolodexService.java       |  4 ++--
 src/main/java/com/pina/datatypes/Livestream.java | 24 ------------------------
 src/main/java/com/pina/datatypes/Video.java      | 24 ++++++++++++++++++++++++
 5 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 src/main/java/com/pina/datatypes/Livestream.java
 create mode 100644 src/main/java/com/pina/datatypes/Video.java

(limited to 'src/main/java')

diff --git a/src/main/java/App.java b/src/main/java/App.java
index 714ab27..ce2dc80 100644
--- a/src/main/java/App.java
+++ b/src/main/java/App.java
@@ -1,6 +1,6 @@
 import com.pina.Holodex;
 import com.pina.HolodexException;
-import com.pina.datatypes.Livestream;
+import com.pina.datatypes.Video;
 import com.pina.query.LiveStreamsQueryBuilder;
 
 import java.util.List;
@@ -12,11 +12,11 @@ public class App
         Holodex holodex = new Holodex();
         try {
             LiveStreamsQueryBuilder query = new LiveStreamsQueryBuilder();
-            query.setChannelId("UCBQd84IW8OvM8H5jftHdvmw");
             query.setStatus("live");
-            List<Livestream> livestreams = holodex.getLiveStreams(query);
-            for (Livestream stream : livestreams) {
-                System.out.println(stream.title + " is live with " + stream.live_viewers + " viewers" + stream.id);
+            query.setOrg("WACTOR");
+            List<Video> videos = holodex.getLiveStreams(query);
+            for (Video stream : videos) {
+                System.out.println(stream.title + " is live with " + stream.live_viewers + " viewers " + stream.id);
             }
         } catch (HolodexException e) {
             System.err.println("Failed to get live streams: " + e.getMessage());
diff --git a/src/main/java/com/pina/Holodex.java b/src/main/java/com/pina/Holodex.java
index 762b0b1..7584de9 100644
--- a/src/main/java/com/pina/Holodex.java
+++ b/src/main/java/com/pina/Holodex.java
@@ -1,6 +1,6 @@
 package com.pina;
 
-import com.pina.datatypes.Livestream;
+import com.pina.datatypes.Video;
 import com.pina.query.LiveStreamsQueryBuilder;
 import retrofit2.Call;
 import retrofit2.Response;
@@ -20,8 +20,8 @@ public class Holodex {
                 .build();
         service = retrofit.create(HolodexService.class);
     }
-    public List<Livestream> getLiveStreams(LiveStreamsQueryBuilder queryBuilder) throws HolodexException {
-        Call<List<Livestream>> call = service.getLiveStreams(queryBuilder.getChannelId(), queryBuilder.getId(),
+    public List<Video> getLiveStreams(LiveStreamsQueryBuilder queryBuilder) throws HolodexException {
+        Call<List<Video>> call = service.getLiveStreams(queryBuilder.getChannelId(), queryBuilder.getId(),
                 queryBuilder.getInclude(), queryBuilder.getLang(),
                 queryBuilder.getLimit(), queryBuilder.getMaxUpcomingHours(),
                 queryBuilder.getMentionedChannelId(), queryBuilder.getOffset(),
diff --git a/src/main/java/com/pina/HolodexService.java b/src/main/java/com/pina/HolodexService.java
index ca7d0d5..2f11f28 100644
--- a/src/main/java/com/pina/HolodexService.java
+++ b/src/main/java/com/pina/HolodexService.java
@@ -2,14 +2,14 @@ package com.pina;
 
 import java.util.List;
 
-import com.pina.datatypes.Livestream;
+import com.pina.datatypes.Video;
 import retrofit2.Call;
 import retrofit2.http.GET;
 import retrofit2.http.Query;
 
 public interface HolodexService {
     @GET("/api/v2/live")
-    Call<List<Livestream>> getLiveStreams(
+    Call<List<Video>> getLiveStreams(
             @Query("channel_id") String channel_id,
             @Query("id") String id,
             @Query("include") String include,
diff --git a/src/main/java/com/pina/datatypes/Livestream.java b/src/main/java/com/pina/datatypes/Livestream.java
deleted file mode 100644
index c70d9d3..0000000
--- a/src/main/java/com/pina/datatypes/Livestream.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.pina.datatypes;
-
-
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-@JsonIgnoreProperties(ignoreUnknown = true)
-public class Livestream {
-    public String id;
-    public String title;
-    public String type;
-    public String topic;
-    public String published_at;
-    public String available_at;
-    public int duration;
-    public String status;
-    public String start_scheduled;
-    public String start_actual;
-    public String thumbnail;
-    public int live_viewers;
-    public Channel channel;
-}
-
-
-
diff --git a/src/main/java/com/pina/datatypes/Video.java b/src/main/java/com/pina/datatypes/Video.java
new file mode 100644
index 0000000..ba0f285
--- /dev/null
+++ b/src/main/java/com/pina/datatypes/Video.java
@@ -0,0 +1,24 @@
+package com.pina.datatypes;
+
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class Video {
+    public String id;
+    public String title;
+    public String type;
+    public String topic;
+    public String published_at;
+    public String available_at;
+    public int duration;
+    public String status;
+    public String start_scheduled;
+    public String start_actual;
+    public String thumbnail;
+    public int live_viewers;
+    public Channel channel;
+}
+
+
+
-- 
cgit v1.2.3