Fetch subtitles when available

Author: colinleroy

src/iinvidious/config.c

@@ -14,6 +14,8 @@
 extern unsigned char scrw;
 char *translit_charset;
 char video_size;
+char enable_subtitles;
+
 char tmp_buf[80];
 
 #pragma code-name(push, "LOWCODE")
@@ -40,9 +42,10 @@ static int save_config(void) {
     return -1;
   }
 
-  r = fprintf(fp, "%s\n%d\n",
+  r = fprintf(fp, "%s\n%d\n%d\n",
                   translit_charset,
-                  video_size);
+                  video_size,
+                  enable_subtitles);
 
   if (r < 0 || fclose(fp) != 0) {
     cputs("Could not save settings file.\r\n");
@@ -105,6 +108,9 @@ void config(void) {
   cputs("\r\nVideo size (Small - more FPS / Large - less FPS)? (s/l)\r\n");
   video_size = get_bool('l', 's');
 
+  cputs("\r\nEnable subtitles? (y/n)\r\n");
+  enable_subtitles = get_bool('y', 'n');
+
   save_config();
 }
 
@@ -116,6 +122,7 @@ void load_config(void) {
 
   translit_charset = US_CHARSET;
   video_size = 0;
+  enable_subtitles = 1;
 
   cputs("Loading config...\r\n");
   fp = open_config("r");
@@ -128,14 +135,13 @@ void load_config(void) {
     if (strchr(tmp_buf, '\n')) {
       *strchr(tmp_buf, '\n') = '\0';
     }
-#ifdef __APPLE2ENH__
     translit_charset = strdup(tmp_buf);
-#endif
 
     fgets(tmp_buf, 16, fp);
-#ifdef __APPLE2ENH__
     video_size = (tmp_buf[0]-'0');
-#endif
+
+    fgets(tmp_buf, 16, fp);
+    enable_subtitles = (tmp_buf[0] != '0');
 
     fclose(fp);
   }

src/iinvidious/config.h

@@ -7,6 +7,9 @@
 
 extern char *translit_charset;
 extern char video_size;
+extern char enable_subtitles;
+extern char tmp_buf[80];
+
 void config(void);
 void load_config(void);
 

src/iinvidious/main.c

@@ -47,11 +47,13 @@
 
 #define PING_API_ENDPOINT           "/api/v1/ping"
 
-#define PEERTUBE_SEARCH_API_ENDPOINT         "/api/v1/search/videos?search=%s"
+#define PEERTUBE_SEARCH_API_ENDPOINT         "/api/v1/search/videos?sort=match&search=%s"
 #define PEERTUBE_VIDEO_DETAILS_API_ENDPOINT  "/api/v1/videos/%s"
+#define PEERTUBE_CAPTIONS_API_ENDPOINT       "/api/v1/videos/%s/captions"
 
 #define INVIDIOUS_SEARCH_API_ENDPOINT         "/api/v1/search?type=video&sort=relevance&q=%s"
 #define INVIDIOUS_VIDEO_DETAILS_API_ENDPOINT  "/api/v1/videos/%s?local=true"
+#define INVIDIOUS_CAPTIONS_API_ENDPOINT       "/api/v1/captions/%s"
 
 /* Peertube's .previewPath is an absolute URL without domain, but this can be
  * not addressed as the thumbnail request comes right after the video details
@@ -62,6 +64,11 @@ static const char *VIDEO_DETAILS_JSON_SELECTOR[] = {
   ".[]|.title,.videoId,.author,(.videoThumbnails[]|select(.quality == \"medium\")|.url),.lengthSeconds"
 };
 
+static const char *CAPTIONS_JSON_SELECTOR[] = {
+  "(.data[]|select(.language.id == \"en\")|.captionPath),.data[0].captionPath",
+  "(.captions[]|select(.label==\"English\")|.url),.captions[0].url"
+};
+
 #define N_VIDEO_DETAILS 5
 #define VIDEO_NAME   0
 #define VIDEO_ID     1
@@ -102,11 +109,12 @@ static void load_indicator(char on) {
 }
 
 static void load_video(char *id) {
+  strcpy(tmp_buf, id); /* Make it safe, id points to BUF_8K */
   load_indicator(1);
   if (instance_type == PEERTUBE)
-    sprintf((char *)BUF_1K_ADDR, "%s" PEERTUBE_VIDEO_DETAILS_API_ENDPOINT, url, id);
+    sprintf((char *)BUF_1K_ADDR, "%s" PEERTUBE_VIDEO_DETAILS_API_ENDPOINT, url, tmp_buf);
   else
-    sprintf((char *)BUF_1K_ADDR, "%s" INVIDIOUS_VIDEO_DETAILS_API_ENDPOINT, url, id);
+    sprintf((char *)BUF_1K_ADDR, "%s" INVIDIOUS_VIDEO_DETAILS_API_ENDPOINT, url, tmp_buf);
 
   surl_start_request(SURL_METHOD_GET, (char *)BUF_1K_ADDR, NULL, 0);
 
@@ -117,10 +125,46 @@ static void load_video(char *id) {
     goto out;
   }
 
-  if (surl_get_json((char *)BUF_1K_ADDR, BUF_1K_SIZE, SURL_HTMLSTRIP_NONE, translit_charset,
+  if (surl_get_json((char *)BUF_8K_ADDR, BUF_8K_SIZE, SURL_HTMLSTRIP_NONE, translit_charset,
                     VIDEO_URL_JSON_SELECTOR[instance_type]) > 0) {
+    char *captions = NULL;
+
+    if (enable_subtitles) {
+      if (instance_type == PEERTUBE)
+        sprintf((char *)BUF_1K_ADDR, "%s" PEERTUBE_CAPTIONS_API_ENDPOINT, url, tmp_buf);
+      else
+        sprintf((char *)BUF_1K_ADDR, "%s" INVIDIOUS_CAPTIONS_API_ENDPOINT, url, tmp_buf);
+
+      surl_start_request(SURL_METHOD_GET, (char *)BUF_1K_ADDR, NULL, 0);
+
+      if (surl_response_ok()) {
+        int url_len = strlen(url);
+
+        /* Prefix first result with instance URL */
+        strcpy((char *)BUF_1K_ADDR, url);
+        /* Get JSON right after the instance URL */
+        if (surl_get_json((char *)(BUF_1K_ADDR + url_len), BUF_1K_SIZE - url_len,
+                          SURL_HTMLSTRIP_NONE, translit_charset,
+                          CAPTIONS_JSON_SELECTOR[instance_type]) > 0) {
+          char *eol = strchr((char *)BUF_1K_ADDR, '\n');
+          /* Cut at end of first match */
+          if (eol) {
+            *eol = '\0';
+          }
+          /* If we had an absolute URL without host */
+          if (((char *)BUF_1K_ADDR)[url_len] == '/') {
+            /* Pass our built URL */
+            captions = (char *)BUF_1K_ADDR;
+          } else {
+            /* Pass what the server returned */
+            captions = (char *)(BUF_1K_ADDR + url_len);
+          }
+        }
+      }
+
+    }
     load_indicator(0);
-    stream_url((char *)BUF_1K_ADDR);
+    stream_url((char *)BUF_8K_ADDR, captions);
 
     backup_restore_logo("r");
     videomode(VIDEOMODE_80COL);
@@ -335,7 +379,7 @@ int main(void) {
 
   screensize(&scrw, &scrh);
   set_scrollwindow(20, scrh);
-  
+ 
   surl_ping();
   load_config();
 

src/iinvidious/videoplay.c

@@ -26,19 +26,17 @@ static void update_progress(void) {
     cprintf("(About %ds remaining)   ", eta*8);
 }
 
-int stream_url(char *url) {
+int stream_url(char *url, char *subtitles_url) {
   char r;
 
   surl_start_request(SURL_METHOD_STREAM_AV, url, NULL, 0);
   simple_serial_write(translit_charset, strlen(translit_charset));
   simple_serial_putc('\n');
   simple_serial_putc(1); /* Monochrome */
-  simple_serial_putc(0); /* Enable subtitles */
+  simple_serial_putc(subtitles_url != NULL); /* Enable subtitles */
   simple_serial_putc(video_size);
 
   clrscr();
-  /* clear text page 2 */
-  memset((char*)0x800, ' '|0x80, 0x400);
 
   cputs("Loading...\r\n"
         "Controls: Space:      Play/Pause,             Esc: Quit player,\r\n"
@@ -65,6 +63,8 @@ int stream_url(char *url) {
     goto wait_load;
 
   } else if (r == SURL_ANSWER_STREAM_START) {
+    /* clear text page 2 */
+    memset((char*)0x800, ' '|0x80, 0x400);
     videomode(VIDEOMODE_40COL);
     hgr_mixoff();
     clrscr();

src/iinvidious/videoplay.h

@@ -1,6 +1,6 @@
 #ifndef __videoplay_h
 #define __videoplay_h
 
-int stream_url(char *url);
+int stream_url(char *url, char *subtitles_url);
 
 #endif