Misc fixes (#244)

* cleared up docs

* fix 401 bug for images thumbnail

README.md

@@ -108,31 +108,35 @@ Options:
   --help                  Show help                                                                            [boolean]
   --version               Show version number                                                                  [boolean]
   --username, -u          The username used to log into Microsoft Stream (enabling this will fill in the email field for
-                          you)                                                                                  [string]
-  --videoUrls, -i         List of video urls                                                                     [array]
+                          you).                                                                                 [string]
+  --videoUrls, -i         List of urls to videos or Microsoft Stream groups.                                     [array]
   --inputFile, -f         Path to text file containing URLs and optionally outDirs. See the README for more on outDirs.
                                                                                                                 [string]
+  --outputDirectory, -o   The directory where destreamer will save your downloads.          [string] [default: "videos"]
   --outputTemplate, -t    The template for the title. See the README for more info.
                                                                 [string] [default: "{title} - {publishDate} {uniqueId}"]
-  --outputDirectory, -o   The directory where destreamer will save your downloads           [string] [default: "videos"]
-  --keepLoginCookies, -k  Let Chromium cache identity provider cookies so you can use "Remember me" during login
+  --keepLoginCookies, -k  Let Chromium cache identity provider cookies so you can use "Remember me" during login.
+                          Must be used every subsequent time you launch Destreamer if you want to log in automatically.
                                                                                               [boolean] [default: false]
-  --noExperiments, -x     Do not attempt to render video thumbnails in the console            [boolean] [default: false]
-  --simulate, -s          Disable video download and print metadata information to the console[boolean] [default: false]
-  --verbose, -v           Print additional information to the console (use this before opening an issue on GitHub)
+  --noExperiments, -x     Do not attempt to render video thumbnails in the console.           [boolean] [default: false]
+  --simulate, -s          Disable video download and print metadata information to the console.
                                                                                               [boolean] [default: false]
-  --closedCaptions, --cc  Check if closed captions are aviable and let the user choose which one to download (will not
-                          ask if only one aviable)                                            [boolean] [default: false]
-  --noCleanup, --nc       Do not delete the downloaded video file when an FFmpeg error occurs [boolean] [default: false]
+  --verbose, -v           Print additional information to the console (use this before opening an issue on GitHub).
+                                                                                              [boolean] [default: false]
+  --closedCaptions, --cc  Check if closed captions are available and let the user choose which one to download (will not
+                          ask if only one available).                                         [boolean] [default: false]
+  --noCleanup, --nc       Do not delete the downloaded video file when an FFmpeg error occurs.[boolean] [default: false]
   --vcodec                Re-encode video track. Specify FFmpeg codec (e.g. libx265) or set to "none" to disable video.
                                                                                               [string] [default: "copy"]
   --acodec                Re-encode audio track. Specify FFmpeg codec (e.g. libopus) or set to "none" to disable audio.
                                                                                               [string] [default: "copy"]
-  --format                Output container format (mkv, mp4, mov, anything that FFmpeg supports)
+  --format                Output container format (mkv, mp4, mov, anything that FFmpeg supports).
                                                                                                [string] [default: "mkv"]
-  --skip                  Skip download if file already exists                                [boolean] [default: false]
+  --skip                  Skip download if file already exists.                               [boolean] [default: false]
 ```
 
+- both --videoUrls and --inputFile also accept Microsoft Teams Groups url so if your Organization placed the videos you are interested in a group you can copy the link and Destreamer will download all the videos it can inside it! A group url looks like this https://web.microsoftstream.com/group/XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX
+
 - Passing `--username` is optional. It's there to make logging in faster (the username field will be populated automatically on the login form).
 
 - You can use an absolute path for `-o` (output directory), for example `/mnt/videos`.

src/ApiClient.ts

@@ -43,6 +43,11 @@ export class ApiClient {
         });
     }
 
+    /**
+     * Used to initialize/retrive the active ApiClient
+     *
+     * @param session used if initializing
+     */
     public static getInstance(session?: Session): ApiClient {
         if (!ApiClient.instance) {
             ApiClient.instance = new ApiClient(session);
@@ -51,6 +56,16 @@ export class ApiClient {
         return ApiClient.instance;
     }
 
+    public setSession(session: Session): void {
+        if (!ApiClient.instance) {
+            logger.warn("Trying to update ApiCient session when it's not initialized!");
+        }
+
+        this.session = session;
+
+        return;
+    }
+
     /**
      * Call Microsoft Stream API. Base URL is sourced from
      * the session object and prepended automatically.

src/CommandLineParser.ts

@@ -13,12 +13,12 @@ export const argv: any = yargs.options({
     username: {
         alias: 'u',
         type: 'string',
-        describe: 'The username used to log into Microsoft Stream (enabling this will fill in the email field for you)',
+        describe: 'The username used to log into Microsoft Stream (enabling this will fill in the email field for you).',
         demandOption: false
     },
     videoUrls: {
         alias: 'i',
-        describe: 'List of video urls',
+        describe: 'List of urls to videos or Microsoft Stream groups.',
         type: 'array',
         demandOption: false
     },
@@ -30,7 +30,7 @@ export const argv: any = yargs.options({
     },
     outputDirectory: {
         alias: 'o',
-        describe: 'The directory where destreamer will save your downloads',
+        describe: 'The directory where destreamer will save your downloads.',
         type: 'string',
         default: 'videos',
         demandOption: false
@@ -44,42 +44,43 @@ export const argv: any = yargs.options({
     },
     keepLoginCookies: {
         alias: 'k',
-        describe: 'Let Chromium cache identity provider cookies so you can use "Remember me" during login',
+        describe: 'Let Chromium cache identity provider cookies so you can use "Remember me" during login.\n' +
+                  'Must be used every subsequent time you launch Destreamer if you want to log in automatically.',
         type: 'boolean',
         default: false,
         demandOption: false
     },
     noExperiments: {
         alias: 'x',
-        describe: 'Do not attempt to render video thumbnails in the console',
+        describe: 'Do not attempt to render video thumbnails in the console.',
         type: 'boolean',
         default: false,
         demandOption: false
     },
     simulate: {
         alias: 's',
-        describe: 'Disable video download and print metadata information to the console',
+        describe: 'Disable video download and print metadata information to the console.',
         type: 'boolean',
         default: false,
         demandOption: false
     },
     verbose: {
         alias: 'v',
-        describe: 'Print additional information to the console (use this before opening an issue on GitHub)',
+        describe: 'Print additional information to the console (use this before opening an issue on GitHub).',
         type: 'boolean',
         default: false,
         demandOption: false
     },
     closedCaptions: {
         alias: 'cc',
-        describe: 'Check if closed captions are available and let the user choose which one to download (will not ask if only one available)',
+        describe: 'Check if closed captions are available and let the user choose which one to download (will not ask if only one available).',
         type: 'boolean',
         default: false,
         demandOption: false
     },
     noCleanup: {
         alias: 'nc',
-        describe: 'Do not delete the downloaded video file when an FFmpeg error occurs',
+        describe: 'Do not delete the downloaded video file when an FFmpeg error occurs.',
         type: 'boolean',
         default: false,
         demandOption: false
@@ -97,13 +98,13 @@ export const argv: any = yargs.options({
         demandOption: false
     },
     format: {
-        describe: 'Output container format (mkv, mp4, mov, anything that FFmpeg supports)',
+        describe: 'Output container format (mkv, mp4, mov, anything that FFmpeg supports).',
         type: 'string',
         default: 'mkv',
         demandOption: false
     },
     skip: {
-        describe: 'Skip download if file already exists',
+        describe: 'Skip download if file already exists.',
         type: 'boolean',
         default: false,
         demandOption: false

src/destreamer.ts

@@ -13,6 +13,7 @@ import cliProgress from 'cli-progress';
 import fs from 'fs';
 import isElevated from 'is-elevated';
 import puppeteer from 'puppeteer';
+import { ApiClient } from './ApiClient';
 
 
 const { FFmpegCommand, FFmpegInput, FFmpegOutput } = require('@tedconf/fessonia')();
@@ -151,6 +152,7 @@ async function downloadVideo(videoGUIDs: Array<string>, outputDirectories: Array
         if (argv.keepLoginCookies && index !== 0) {
             logger.info('Trying to refresh token...');
             session = await refreshSession('https://web.microsoftstream.com/video/' + videoGUIDs[index]);
+            ApiClient.getInstance().setSession(session);
         }
 
         const pbar: cliProgress.SingleBar = new cliProgress.SingleBar({