1.4.5

(fix a **** stupid bug while doing version checking)

README.md

@@ -69,12 +69,14 @@ The [command-line interface](http://en.wikipedia.org/wiki/Command-line_interface
         -V, --version         output the version number
         -p, --pass <s>        The password.
         -u, --user <s>        The e-mail address or username.
+        -d, --unlog           Unlog
         -c, --cache           Disables the cache.
         -m, --merge           Disables merging subtitles and videos.
         -e, --episodes <s>    Episode list. Read documentation on how to use
         -f, --format <s>      The subtitle format. (default: ass)
         -o, --output <s>      The output path.
         -s, --series <s>      The series name override.
+        --ignoredub           Experimental: Ignore all seasons where the title end with 'Dub)'
         -n, --nametmpl <s>    Output name template (default: {SERIES_TITLE} - s{SEASON_NUMBER}e{EPISODE_NUMBER} - [{TAG}])
         -t, --tag <s>         The subgroup. (default: CrunchyRoll)
         -r, --resolution <s>  The video resolution. (valid: 360, 480, 720, 1080) (default: 1080)
@@ -88,6 +90,51 @@ The [command-line interface](http://en.wikipedia.org/wiki/Command-line_interface
 
 When no sequence of series addresses is provided, the batch-mode source file will be read (which is *CrunchyRoll.txt* in the current work directory. Each line in this file is processed contain the URL of a series and can support some of the command line parameter (like `-e`). This makes it ideal to manage a large sequence of series addresses.
 
+#### Configuration file
+
+Starting from version 1.4.0, Crunchy store some information in a config.json file. The file which is use have to be in the folder you are calling Crunchy. This is partly by design and a limitation on where Crunchy can find files.
+
+This file store some informations like your username and password.
+
+You don't need to create that file as Crunchy will create it for you, the first time you run it. Each run will update the content of the file, so it you run crunchy with your credential on the command line, it will add them to config file.
+
+There are some parameter that the config file can accept which are not created by default, and some of them are cannont be set form the command line parameter.
+
+Don't mess with them if you don't know what you are doing.
+
+Here are the list of valid parameter in the config file:
+
+ - Output options
+  * `merge` see `--merge`
+  * `format` see `--format`
+  * `output` see `--output`
+  * `nametmpl` see `--nametmpl`
+  * `tag` see `--tag`
+  * `resolution` see `--resolution`
+
+ - Login related options:
+  * `pass` see `--user`
+  * `user` see `--pass`
+  * `userAgent` set the user agent reported by Crunchy while crawling pages
+  * `logUsingApi`
+  * `logUsingCookie`
+  * `crSessionUrl`
+  * `crDeviceType`
+  * `crAPIVersion`
+  * `crLocale`
+  * `crSessionKey`
+  * `crLoginUrl`
+  * `crUserId`
+  * `crUserKey`
+
+ - Generated values: don't touch them:
+  * `crDeviceId`
+  * `crSessionId`
+
+Some of theses login related options are not going to be documented on what to put there for _legal_ reason.
+
+Crunchy will also create a `.cookie.jar` file in the output folder (by default the current folder) it is the file used by Crunchy to store the web cookies.
+
 #### Examples
 
 Download in batch-mode:
@@ -142,8 +189,12 @@ Download episodes starting from 42 to the last available of *Tail Fairy*:
 
 * `-p or --pass <s>` sets the password.
 * `-u or --user <s>` sets the e-mail address or username.
+* `-d or --unlog` unlog
 
- _Please remember that login has to be done for each call of Crunchy, as none of the credentials are stored_
+_New in 1.4.0_: Crunchy remember between run about login information and other, so you need to passe the login and password only once
+I recommend to unlog if you see some problems during the run.
+
+*When you unlog, the cookie file is deleted as for some parameter in the config file (like username and password).*
 
 ##### Disables
 
@@ -159,6 +210,7 @@ Download episodes starting from 42 to the last available of *Tail Fairy*:
 * `-t or --tag <s>` sets The subgroup. (Default: CrunchyRoll)
 * `-r or --resolution <s>` sets the resolutoin you want to download (360, 480, 720, 1080)
 * `--retry <i>` set the number of try Crunchy will use if downloading a serie or episode fail
+* `--ignoredub` It is an experimental features that will ignore all season where the name ends with 'dub)'. The idea is to try to ignore dubbed season.
 
 ##### Others
 

package.json

@@ -15,7 +15,7 @@
   "engines": {
     "node": ">=5.0"
   },
-  "version": "1.3.7",
+  "version": "1.4.5",
   "bin": {
     "crunchy": "./bin/crunchy",
     "crunchy.sh": "./bin/crunchy.sh"
@@ -31,6 +31,8 @@
     "pjson": "^1.0.9",
     "request": "^2.87.0",
     "request-promise": "^4.2.2",
+    "tough-cookie-file-store": "^1.2.0",
+    "uuid": "^3.3.2",
     "xml2js": "^0.4.5"
   },
   "devDependencies": {
@@ -41,6 +43,7 @@
     "@types/node": "^10.5.3",
     "@types/request": "^2.47.1",
     "@types/request-promise": "^4.1.42",
+    "@types/uuid": "^3.4.3",
     "@types/xml2js": "^0.4.3",
     "npm-check": "^5.7.1",
     "tsconfig-lint": "^0.12.0",

src/batch.ts

@@ -3,6 +3,8 @@ import commander = require('commander');
 import fs = require('fs');
 import path = require('path');
 import log = require('./log');
+import my_request = require('./my_request');
+import cfg = require('./config');
 import series from './series';
 
 /* correspondances between resolution and value CR excpect */
@@ -19,8 +21,37 @@ const resol_table: { [id: string]: IResolData; } =
  */
 export default function(args: string[], done: (err?: Error) => void)
 {
-  const config = parse(args);
-  const batchPath = path.join(config.output || process.cwd(), config.batch);
+  const config = Object.assign(cfg.load(), parse(args));
+  let batchPath;
+
+  if (path.isAbsolute(config.batch))
+  {
+    batchPath = path.normalize(config.batch);
+  }
+  else
+  {
+    batchPath = path.normalize(path.join(process.cwd(), config.batch));
+  }
+
+  if (config.nametmpl === undefined)
+  {
+    config.nametmpl = '{SERIES_TITLE} - s{SEASON_NUMBER}e{EPISODE_NUMBER} - {EPISODE_TITLE} - [{TAG}]';
+  }
+
+  // Update the config file with new parameters
+  cfg.save(config);
+
+  if (config.unlog)
+  {
+    config.crDeviceId = undefined;
+    config.user = undefined;
+    config.pass = undefined;
+    my_request.eatCookies(config);
+    cfg.save(config);
+    log.info('Unlogged!');
+
+    process.exit(0);
+  }
 
   // set resolution
   if (config.resolution)
@@ -62,7 +93,7 @@ export default function(args: string[], done: (err?: Error) => void)
         return done(err);
     }
 
-    if (tasksArr[0].address === '')
+    if (!tasksArr || !tasksArr[0] || (tasksArr[0].address === ''))
     {
         return done();
     }
@@ -73,6 +104,9 @@ export default function(args: string[], done: (err?: Error) => void)
     {
       if (i >= tasksArr.length)
       {
+        // Save configuration before leaving (should store info like session & other)
+        cfg.save(config);
+
         return done();
       }
 
@@ -91,7 +125,13 @@ export default function(args: string[], done: (err?: Error) => void)
             tasksArr[i].retry = 0;
           }
 
-          if (tasksArr[i].retry <= 0)
+          if (errin.authError)
+          {
+            /* Force a graceful exit */
+            log.error(errin.message);
+            i = tasksArr.length;
+          }
+          else if (tasksArr[i].retry <= 0)
           {
             log.error(JSON.stringify(errin));
             if (config.debug)
@@ -217,7 +257,15 @@ function checkURL(address: string): boolean
   {
     return true;
   }
-  if (address.startsWith('http:\/\/'))
+  if (address.startsWith('https:\/\/'))
+  {
+    return true;
+  }
+  if (address.startsWith('@http:\/\/'))
+  {
+    return true;
+  }
+  if (address.startsWith('@https:\/\/'))
   {
     return true;
   }
@@ -299,16 +347,19 @@ function parse(args: string[]): IConfigLine
     // Authentication
     .option('-p, --pass <s>', 'The password.')
     .option('-u, --user <s>', 'The e-mail address or username.')
+    .option('-d, --unlog', 'Unlog')
     // Disables
     .option('-c, --cache', 'Disables the cache.')
     .option('-m, --merge', 'Disables merging subtitles and videos.')
     // Episode filter
     .option('-e, --episodes <s>', 'Episode list. Read documentation on how to use')
     // Settings
+    .option('-l, --crlang <s>', 'CR page language (valid: en, fr, es, it, pt, de, ru).')
     .option('-f, --format <s>', 'The subtitle format.', 'ass')
     .option('-o, --output <s>', 'The output path.')
     .option('-s, --series <s>', 'The series name override.')
-    .option('-n, --nametmpl <s>', 'Output name template', '{SERIES_TITLE} - s{SEASON_NUMBER}e{EPISODE_NUMBER} - {EPISODE_TITLE} - [{TAG}]')
+    .option('--ignoredub', 'Experimental: Ignore all seasons where the title end with \'Dub)\'')
+    .option('-n, --nametmpl <s>', 'Output name template')
     .option('-t, --tag <s>', 'The subgroup.', 'CrunchyRoll')
     .option('-r, --resolution <s>', 'The video resolution. (valid: 360, 480, 720, 1080)', '1080')
     .option('-b, --batch <s>', 'Batch file', 'CrunchyRoll.txt')

src/cli.ts

@@ -8,17 +8,27 @@ const current_version = pjson.version;
 
 /* Check if the current version is the latest */
 log.info('Crunchy version ' + current_version);
-request.get({ uri: 'https://raw.githubusercontent.com/Godzil/Crunchy/master/package.json' },
+request.get({ uri: 'https://box.godzil.net/getVersion.php?tool=crunchy&v=' + current_version },
                   (error: Error, response: any, body: any) =>
 {
-  const onlinepkg = JSON.parse(body);
-  let tmp = current_version.split('.');
-  const cur = (Number(tmp[0]) * 10000) + (Number(tmp[1]) * 100) + Number(tmp[2]);
-  tmp = onlinepkg.version.split('.');
-  const dist = (Number(tmp[0]) * 10000) + (Number(tmp[1]) * 100) + Number(tmp[2]);
-  if (dist > cur)
+  if (response && (response.statusCode === 200))
   {
-    log.warn('There is a newer version of crunchy (v' + onlinepkg.version + '), you should update!');
+    const onlinepkg = JSON.parse(body);
+    if (onlinepkg.status === 'ok')
+    {
+      let tmp = current_version.split('.');
+      const cur = (Number(tmp[0]) * 10000) + (Number(tmp[1]) * 100) + Number(tmp[2]);
+      tmp = onlinepkg.version.split('.');
+      const dist = (Number(tmp[0]) * 10000) + (Number(tmp[1]) * 100) + Number(tmp[2]);
+      if (dist > cur)
+      {
+        log.warnMore('There is a newer version of crunchy (v' + onlinepkg.version + '), you should update!');
+      }
+    }
+  }
+  else
+  {
+    log.info('Error while checking for the current version.');
   }
 });
 

src/config.ts

@@ -0,0 +1,63 @@
+'use strict';
+import os = require('os');
+import fs = require('fs-extra');
+import path = require('path');
+
+const configFile = path.join(process.cwd(), 'config.json');
+
+function fileExist(path: string)
+{
+  try
+  {
+    fs.statSync(path);
+    return true;
+  } catch (e)
+  {
+    return false;
+  }
+}
+
+export function load(): IConfigLine
+{
+  if (fileExist(configFile))
+  {
+    const data = fs.readFileSync(configFile, 'utf8');
+    return JSON.parse(data);
+  }
+
+  return {args: undefined};
+}
+
+export function save(config: IConfig)
+{
+  const tmp = JSON.parse(JSON.stringify(config));
+
+  // Things added by the command line parser
+  tmp.rawArgs = undefined;
+  tmp.options = undefined;
+  tmp._execs = undefined;
+  tmp._args = undefined;
+  tmp._name = undefined;
+  tmp._version = undefined;
+  tmp._versionOptionName = undefined;
+  tmp._events = undefined;
+  tmp._eventsCount = undefined;
+  tmp.args = undefined;
+  tmp.commands = undefined;
+  tmp._allowUnknownOption = undefined;
+
+  // Things we don't want to save
+  tmp.cache = undefined;
+  tmp.episodes = undefined;
+  tmp.series = undefined;
+  tmp.video_format = undefined;
+  tmp.video_quality = undefined;
+  tmp.rebuildcrp = undefined;
+  tmp.batch = undefined;
+  tmp.verbose = undefined;
+  tmp.debug = undefined;
+  tmp.unlog = undefined;
+  tmp.ignoredub = undefined;
+
+  fs.writeFileSync(configFile, JSON.stringify(tmp, null, '  '));
+}

src/episode.ts

@@ -66,7 +66,7 @@ function fileExist(path: string)
 
 function sanitiseFileName(str: string)
 {
-  return str.replace(/[\/':\?\*"<>\.]/g, '_');
+  return str.replace(/[\/':\?\*"<>\\\.\|]/g, '_');
 }
 
 /**
@@ -186,6 +186,11 @@ function downloadSubtitle(config: IConfig, player: IEpisodePlayer, filePath: str
       return done(errSD);
     }
 
+    if (config.debug)
+    {
+      log.dumpToDebug('SubtitlesXML', data);
+    }
+
     const formats = subtitle.formats;
     const format = formats[config.format] ? config.format : 'ass';
 

src/interface/AuthError.d.ts

@@ -0,0 +1,3 @@
+interface IAuthError extends Error {
+  authError: boolean;
+}

src/interface/IConfig.d.ts

@@ -7,11 +7,13 @@ interface IConfig {
   merge?: boolean;
   episodes?: string;
   // Settings
+  crlang?: string;
   format?: string;
   output?: string;
   series?: string;
   nametmpl?: string;
   tag?: string;
+  ignoredub?: boolean;
   resolution?: string;
   video_format?: string;
   video_quality?: string;
@@ -19,5 +21,22 @@ interface IConfig {
   batch?: string;
   verbose?: boolean;
   debug?: boolean;
+  unlog?: boolean;
   retry?: number;
+  // Login options
+  userAgent?: string;
+  logUsingApi?: boolean;
+  logUsingCookie?: boolean;
+  crSessionUrl?: string;
+  crDeviceType?: string;
+  crAPIVersion?: string;
+  crLocale?: string;
+  crSessionKey?: string;
+  crLoginUrl?: string;
+  // Third method, injecting data from cookies
+  crUserId?: string;
+  crUserKey?: string;
+  // Generated values
+  crDeviceId?: string;
+  crSessionId?: string;
 }

src/interface/ISeriesEpisode.d.ts

@@ -1,6 +1,7 @@
 interface ISeriesEpisode {
   address: string;
   episode: string;
+  seasonName: string;
   volume: number;
   retry: number;
 }

src/languages.ts

@@ -0,0 +1,66 @@
+'use strict';
+
+const localeCC: { [id: string]: string; } =
+{
+  enUS: 'en', enGB: 'en',
+  esLA: 'es', esES: 'es',
+  ptPT: 'pt', ptBR: 'pt',
+  frFR: 'fr',
+  deDE: 'de',
+  itIT: 'it',
+  ruRU: 'ru',
+};
+
+export function localeToCC(locale: string): string
+{
+  let ret = localeCC.enGB;
+
+  if (locale in localeCC)
+  {
+    ret = localeCC[locale];
+  }
+
+  return ret;
+}
+
+const dubignore_regexp: { [id: string]: RegExp; } =
+{
+  en: /\(.*Dub(?:bed)?.*\)|(?:\(RU\))/i,
+  fr: /\(.*Dub(?:bed)?.*\)|(?:\(RU\))|\(?Doublage.*\)?/,
+  de: /\(.*isch\)|\(Dubbed\)|\(RU\)/
+};
+
+export function get_diregexp(config: IConfig): RegExp
+{
+  let ret = dubignore_regexp.en;
+
+  if (config.crlang in dubignore_regexp)
+  {
+    ret = dubignore_regexp[config.crlang];
+  }
+
+  return ret;
+}
+
+const episodes_regexp: { [id: string]: RegExp; } =
+{
+  en: /Episode\s+((OVA)|(PV )?[S0-9][\-P0-9.]*[a-fA-F]?)\s*$/i,
+  fr: /Épisode\s+((OVA)|(PV )?[S0-9][\-P0-9.]*[a-fA-F]?)\s*$/i,
+  de: /Folge\s+((OVA)|(PV )?[S0-9][\-P0-9.]*[a-fA-F]?)\s*$/i,
+  es: /Episodio\s+((OVA)|(PV )?[S0-9][\-P0-9.]*[a-fA-F]?)\s*$/i,
+  it: /Episodio\s+((OVA)|(PV )?[S0-9][\-P0-9.]*[a-fA-F]?)\s*$/i,
+  pt: /Episódio\s+((OVA)|(PV )?[S0-9][\-P0-9.]*[a-fA-F]?)\s*$/i,
+  ru: /Серия\s+((OVA)|(PV )?[S0-9][\-P0-9.]*[a-fA-F]?)\s*$/i,
+};
+
+export function get_epregexp(config: IConfig): RegExp
+{
+  let ret = episodes_regexp.en;
+
+  if (config.crlang in episodes_regexp)
+  {
+    ret = episodes_regexp[config.crlang];
+  }
+
+  return ret;
+}

src/log.ts

@@ -26,6 +26,12 @@ export function warn(str: string)
   console.log(' \x1B[1;33m* WARN \x1B[0m: ' + str);
 }
 
+export function warnMore(str: string)
+{
+  /* Do fancy output */
+  console.log(' \x1B[1;38;5;166m* WARN \x1B[0m: ' + str);
+}
+
 export function dispEpisode(name: string, status: string, addNL: boolean)
 {
   /* Do fancy output */

src/my_request.ts

@@ -3,72 +3,81 @@ import cheerio = require('cheerio');
 import request = require('request');
 import rp = require('request-promise');
 import Promise = require('bluebird');
+import uuid = require('uuid');
+import path = require('path');
+import fs = require('fs-extra');
+import languages = require('./languages');
 import log = require('./log');
+
 import { RequestPromise } from 'request-promise';
 import { Response } from 'request';
 
+// tslint:disable-next-line:no-var-requires
+const cookieStore = require('tough-cookie-file-store');
 // tslint:disable-next-line:no-var-requires
 const cloudscraper = require('cloudscraper');
 
+const CR_COOKIE_DOMAIN = 'http://crunchyroll.com';
+
 let isAuthenticated = false;
 let isPremium = false;
 
+let j: request.CookieJar;
+
 const defaultHeaders: request.Headers =
 {
-  'User-Agent': 'Mozilla/5.0 (Windows NT 6.2; WOW64; x64; rv:58.0) Gecko/20100101 Firefox/58.0',
+  'User-Agent': 'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36',
   'Connection': 'keep-alive',
   'Referer': 'https://www.crunchyroll.com/login',
 };
 
-function generateDeviceId(): string
+function AuthError(msg: string): IAuthError
 {
-  let id = '';
-  const possible = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
-
-  for (let i = 0; i < 32; i++)
-  {
-    id += possible.charAt(Math.floor(Math.random() * possible.length));
-  }
-
-  return id;
+  return { name: 'AuthError', message: msg, authError: true };
 }
 
-function startSession(): Promise<string>
+function startSession(config: IConfig): Promise<any>
 {
   return rp(
   {
     method: 'GET',
-    url: 'CR_SESSION_URL',
+    url: config.crSessionUrl,
     qs:
     {
-      device_id: generateDeviceId(),
-      device_type: 'CR_DEVICE_TYPE',
-      access_token: 'CR_SESSION_KEY',
-      version: 'CR_API_VERSION',
-      locale: 'CR_LOCALE',
+      device_id: config.crDeviceId,
+      device_type: config.crDeviceType,
+      access_token: config.crSessionKey,
+      version: config.crAPIVersion,
+      locale: config.crLocale,
     },
     json: true,
   })
   .then((response: any) =>
   {
+    if ((response.data === undefined) || (response.data.session_id === undefined))
+    {
+      throw new Error('Getting session failed: ' + JSON.stringify(response));
+    }
+
     return response.data.session_id;
   });
 }
 
-function login(sessionId: string, user: string, pass: string): Promise<any>
+function login(config: IConfig, sessionId: string, user: string, pass: string): Promise<any>
 {
   return rp(
   {
     method: 'POST',
-    url: 'CR_LOGIN_URL',
+    url:  config.crLoginUrl,
     form:
     {
       account: user,
       password: pass,
       session_id: sessionId,
-      version: 'CR_API_VERSION',
+      version: config.crAPIVersion,
     },
     json: true,
+    jar: j,
   })
   .then((response) =>
   {
@@ -77,13 +86,131 @@ function login(sessionId: string, user: string, pass: string): Promise<any>
   });
 }
 
-// TODO: logout
+function checkIfUserIsAuth(config: IConfig, done: (err: Error) => void): void
+{
+  if (j === undefined)
+  {
+    loadCookies(config);
+  }
+
+  /**
+   * The main page give us some information about the user
+   */
+  const options =
+  {
+    headers: defaultHeaders,
+    jar: j,
+    url: 'http://www.crunchyroll.com/',
+    method: 'GET',
+  };
+  cloudscraper.request(options, (err: Error, rep: string, body: string) =>
+  {
+    if (err)
+    {
+      return done(err);
+    }
+
+    const $ = cheerio.load(body);
+
+    /* As we are here, try to detect which locale CR tell us */
+    const localeRE = /LOCALE = "([a-zA-Z]+)",/g;
+    const locale = localeRE.exec($('script').text())[1];
+    const countryCode = languages.localeToCC(locale);
+
+    if (config.crlang === undefined)
+    {
+      log.info('No locale set. Setting to the one reported by CR: "' + countryCode + '"');
+      config.crlang = countryCode;
+    }
+    else if (config.crlang !== countryCode)
+    {
+      log.warn('Crunchy is configured for locale "' + config.crlang + '" but CR report "' + countryCode + '" (LOCALE = ' + locale + ')');
+      log.warn('Check if it is correct or rerun (once) with "-l ' + countryCode + '" to correct.');
+    }
+
+    /* Check if auth worked */
+    const regexps = /ga\('set', 'dimension[5-8]', '([^']*)'\);/g;
+    const dims = regexps.exec($('script').text());
+
+    for (let i = 1; i < 5; i++)
+    {
+      if ((dims[i] !== undefined) && (dims[i] !== '') && (dims[i] !== 'not-registered'))
+      {
+        isAuthenticated = true;
+      }
+
+      if ((dims[i] === 'premium') || (dims[i] === 'premiumplus'))
+      {
+        isPremium = true;
+      }
+    }
+
+    if (isAuthenticated === false)
+    {
+        const error = $('ul.message, li.error').text();
+        log.warn('Authentication failed: ' + error);
+        return done(AuthError('Authentication failed: ' + error));
+    }
+    else
+    {
+      if (isPremium === false)
+      {
+        log.warn('Do not use this app without a premium account.');
+      }
+      else
+      {
+        log.info('You have a premium account! Good!');
+      }
+    }
+
+    done(null);
+  });
+}
+
+function loadCookies(config: IConfig)
+{
+  const cookiePath = path.join(config.output || process.cwd(), '.cookies.json');
+
+  if (!fs.existsSync(cookiePath))
+  {
+    fs.closeSync(fs.openSync(cookiePath, 'w'));
+  }
+
+  j = request.jar(new cookieStore(cookiePath));
+}
+
+export function eatCookies(config: IConfig)
+{
+  const cookiePath = path.join(config.output || process.cwd(), '.cookies.json');
+
+  if (fs.existsSync(cookiePath))
+  {
+      fs.removeSync(cookiePath);
+  }
+
+  j = undefined;
+}
+
+export function getUserAgent(): string
+{
+  return defaultHeaders['User-Agent'];
+}
 
 /**
  * Performs a GET request for the resource.
  */
 export function get(config: IConfig, options: string|request.Options, done: (err: any, result?: string) => void)
 {
+  if (j === undefined)
+  {
+    loadCookies(config);
+  }
+
+  if (config.userAgent)
+  {
+    defaultHeaders['User-Agent'] = config.userAgent;
+  }
+
   authenticate(config, (err) =>
   {
     if (err)
@@ -94,6 +221,7 @@ export function get(config: IConfig, options: string|request.Options, done: (err
     cloudscraper.request(modify(options, 'GET'), (error: any, response: any, body: any) =>
     {
       if (error) return done(error);
+
       done(null, typeof body === 'string' ? body : String(body));
     });
   });
@@ -104,18 +232,28 @@ export function get(config: IConfig, options: string|request.Options, done: (err
  */
 export function post(config: IConfig, options: request.Options, done: (err: Error, result?: string) => void)
 {
+  if (j === undefined)
+  {
+    loadCookies(config);
+  }
+
+  if (config.userAgent)
+  {
+    defaultHeaders['User-Agent'] = config.userAgent;
+  }
+
   authenticate(config, (err) =>
   {
     if (err)
     {
-        return done(err);
+      return done(err);
     }
 
     cloudscraper.request(modify(options, 'POST'), (error: Error, response: any, body: any) =>
     {
       if (error)
       {
-         return done(error);
+        return done(error);
       }
       done(null, typeof body === 'string' ? body : String(body));
     });
@@ -132,77 +270,145 @@ function authenticate(config: IConfig, done: (err: Error) => void)
     return done(null);
   }
 
-  if (!config.pass || !config.user)
+  /* First of all, check if the user is not already logged via the cookies */
+  checkIfUserIsAuth(config, (errCheckAuth) =>
   {
-    log.error('You need to give login/password to use Crunchy');
-    process.exit(-1);
-  }
-
-  startSession()
-  .then((sessionId: string) =>
-  {
-    defaultHeaders.Cookie = `sess_id=${sessionId}; c_locale=enUS`;
-    return login(sessionId, config.user, config.pass);
-  })
-  .then((userData) =>
-  {
-    /**
-     * The page return with a meta based redirection, as we wan't to check that everything is fine, reload
-     * the main page. A bit convoluted, but more sure.
-     */
-    const options =
+    if (isAuthenticated)
     {
-      headers: defaultHeaders,
-      jar: true,
-      url: 'http://www.crunchyroll.com/',
-      method: 'GET',
-    };
+      return done(null);
+    }
 
-    cloudscraper.request(options, (err: Error, rep: string, body: string) =>
+    /* So if we are here now, that mean we are not authenticated so do as usual */
+    if (!config.pass || !config.user)
     {
-      if (err)
+      log.error('You need to give login/password to use Crunchy');
+      process.exit(-1);
+    }
+
+    log.info('Seems we are not currently logged. Let\'s login!');
+
+    if (config.logUsingApi)
+    {
+      if (config.crDeviceId === undefined)
       {
-         return done(err);
+        config.crDeviceId = uuid.v4();
       }
 
-      const $ = cheerio.load(body);
-
-      /* Check if auth worked */
-      const regexps = /ga\('set', 'dimension[5-8]', '([^']*)'\);/g;
-      const dims = regexps.exec($('script').text());
-
-      for (let i = 1; i < 5; i++)
+      if (!config.crSessionUrl || !config.crDeviceType || !config.crAPIVersion ||
+          !config.crLocale || !config.crLoginUrl)
       {
-        if ((dims[i] !== undefined) && (dims[i] !== '') && (dims[i] !== 'not-registered'))
+        return done(AuthError('Invalid API configuration, please check your config file.'));
+      }
+
+      startSession(config)
+      .then((sessionId: string) =>
+      {
+        defaultHeaders.Cookie = `sess_id=${sessionId}; c_locale=enUS`;
+        return login(config, sessionId, config.user, config.pass);
+      })
+      .then((userData) =>
+      {
+        checkIfUserIsAuth(config, (errCheckAuth2) =>
         {
-            isAuthenticated = true;
+          if (isAuthenticated)
+          {
+            return done(null);
+          }
+          else
+          {
+            return done(errCheckAuth2);
+          }
+        });
+      })
+      .catch((errInChk) =>
+      {
+        return done(AuthError(errInChk.message));
+      });
+    }
+    else if (config.logUsingCookie)
+    {
+      j.setCookie(request.cookie('c_userid=' + config.crUserId + '; Domain=crunchyroll.com; HttpOnly; hostOnly=false;'),
+                  CR_COOKIE_DOMAIN);
+      j.setCookie(request.cookie('c_userkey=' + config.crUserKey + '; Domain=crunchyroll.com; HttpOnly; hostOnly=false;'),
+                  CR_COOKIE_DOMAIN);
+
+      checkIfUserIsAuth(config, (errCheckAuth2) =>
+      {
+        if (isAuthenticated)
+        {
+          return done(null);
+        }
+        else
+        {
+          return done(errCheckAuth2);
+        }
+      });
+    }
+    else
+    {
+      /* First get https://www.crunchyroll.com/login to get the login token */
+      const options =
+      {
+        headers: defaultHeaders,
+        jar: j,
+        gzip: false,
+        method: 'GET',
+        url: 'https://www.crunchyroll.com/login'
+      };
+
+      cloudscraper.request(options, (err: Error, rep: string, body: string) =>
+      {
+        if (err) return done(err);
+
+        const $ = cheerio.load(body);
+
+        /* Get the token from the login page */
+        const token = $('input[name="login_form[_token]"]').attr('value');
+        if (token === '')
+        {
+            return done(AuthError('Can\'t find token!'));
         }
 
-        if ((dims[i] === 'premium') || (dims[i] === 'premiumplus'))
+        /* Now call the page again with the token and credentials */
+        const options =
         {
-            isPremium = true;
-        }
-      }
+          headers: defaultHeaders,
+          form:
+          {
+            'login_form[name]': config.user,
+            'login_form[password]': config.pass,
+            'login_form[redirect_url]': '/',
+            'login_form[_token]': token
+          },
+          jar: j,
+          gzip: false,
+          method: 'POST',
+          url: 'https://www.crunchyroll.com/login'
+        };
 
-      if (isAuthenticated === false)
-      {
-        const error = $('ul.message, li.error').text();
-        log.error('Authentication failed: ' + error);
-        process.exit(-1);
-      }
+        cloudscraper.request(options, (err: Error, rep: string, body: string) =>
+        {
+          if (err)
+          {
+              return done(err);
+          }
 
-      if (isPremium === false)
-      {
-          log.warn('Do not use this app without a premium account.');
-      }
-      else
-      {
-        log.info('You have a premium account! Good!');
-      }
-      done(null);
-    });
-  })
-  .catch(done);
+          /* Now let's check if we are authentificated */
+          checkIfUserIsAuth(config, (errCheckAuth2) =>
+          {
+            if (isAuthenticated)
+            {
+              return done(null);
+            }
+            else
+            {
+              return done(errCheckAuth2);
+            }
+          });
+        });
+      });
+    }
+  });
 }
 
 /**
@@ -212,13 +418,14 @@ function modify(options: string|request.Options, reqMethod: string): request.Opt
 {
   if (typeof options !== 'string')
   {
-    options.jar = true;
+    options.jar = j;
     options.headers = defaultHeaders;
     options.method = reqMethod;
+    options.followAllRedirects = true;
     return options;
   }
   return {
-    jar: true,
+    jar: j,
     headers: defaultHeaders,
     url: options.toString(),
     method: reqMethod

src/series.ts

@@ -1,12 +1,13 @@
 'use strict';
 import cheerio = require('cheerio');
 import episode from './episode';
-// import fs = require('fs');
 import fs = require('fs-extra');
 import my_request = require('./my_request');
 import path = require('path');
 import url = require('url');
 import log  = require('./log');
+import languages = require('./languages');
+
 const persistent = '.crpersistent';
 
 /**
@@ -46,9 +47,12 @@ export default function(config: IConfig, task: IConfigTask, done: (err: any) =>
       if (errP)
       {
         const reqErr = errP.error;
-        if ((reqErr.syscall === 'getaddrinfo') && (reqErr.errno === 'ENOTFOUND'))
+        if ((reqErr !== undefined) && (reqErr.syscall))
         {
-          log.error('The URL \'' + task.address + '\' is invalid, please check => I\'m ignoring it.');
+          if ((reqErr.syscall === 'getaddrinfo') && (reqErr.errno === 'ENOTFOUND'))
+          {
+            log.error('The URL \'' + task.address + '\' is invalid, please check => I\'m ignoring it.');
+          }
         }
 
         return done(errP);
@@ -69,10 +73,13 @@ export default function(config: IConfig, task: IConfigTask, done: (err: any) =>
           {
             /* Check if domain is valid */
             const reqErr = errD.error;
-            if ((reqErr.syscall === 'getaddrinfo') && (reqErr.errno === 'ENOTFOUND'))
+            if ((reqErr !== undefined) && (reqErr.syscall))
             {
-               page.episodes[i].retry = 0;
-               log.error('The URL \'' + task.address + '\' is invalid, please check => I\'m ignoring it.');
+              if ((reqErr.syscall === 'getaddrinfo') && (reqErr.errno === 'ENOTFOUND'))
+              {
+                page.episodes[i].retry = 0;
+                log.error('The URL \'' + task.address + '\' is invalid, please check => I\'m ignoring it.');
+              }
             }
 
             if (page.episodes[i].retry <= 0)
@@ -175,6 +182,7 @@ function pageScrape(config: IConfig, task: IConfigTask, done: (err: any, result?
     episodes.push({
       address: task.address.substr(1),
       episode: '',
+      seasonName: '',
       volume: 0,
       retry: config.retry,
     });
@@ -208,27 +216,50 @@ function pageScrape(config: IConfig, task: IConfigTask, done: (err: any, result?
       log.info('Checking availability for ' + title);
       const episodes: ISeriesEpisode[] = [];
 
+      if ($('.availability-notes-low').length)
+      {
+        log.warn('This serie may have georestriction and some missings episode (like some dubs)' +
+                 ' [Message: ' +  $('.availability-notes-low').text() + '].');
+      }
+
+      if ($('.availability-notes-high').length)
+      {
+        log.warnMore('This serie probably have georestriction and will miss some episodes' +
+                     ' [Message: ' +  $('.availability-notes-high').text() + '].');
+      }
+
       $('.episode').each((i, el) => {
         if ($(el).children('img[src*=coming_soon]').length) {
           return;
         }
 
+        const season_name = $(el).closest('ul').prev('a').text();
         const volume = /([0-9]+)\s*$/.exec($(el).closest('ul').prev('a').text());
-        const regexp = /Episode\s+((PV )?[S0-9][\-P0-9.]*[a-fA-F]?)\s*$/i;
+        const regexp = languages.get_epregexp(config);
         const episode = regexp.exec($(el).children('.series-title').text());
         const url = $(el).attr('href');
 
-        if ((!url) || (!episode)) {
+        const igndub_re = languages.get_diregexp(config);
+
+        if (config.ignoredub && (igndub_re.exec(season_name)))
+        {
+          return;
+        }
+
+        if ((!url) || (!episode))
+        {
           return;
         }
         episodeCount += 1;
         episodes.push({
           address: url,
           episode: episode[1],
+          seasonName: season_name,
           volume: volume ? parseInt(volume[0], 10) : 1,
           retry: config.retry,
         });
       });
+
       if (episodeCount === 0)
       {
         log.warn('No episodes found for ' + title + '. Could it be a movie?');

src/video/stream.ts

@@ -3,6 +3,7 @@ import childProcess = require('child_process');
 import os = require('os');
 import path = require('path');
 
+import my_request = require('../my_request');
 import log  = require('../log');
 
 /**
@@ -24,7 +25,8 @@ export default function(rtmpUrl: string, rtmpInputPath: string, swfUrl: string,
   else if (mode === 'HLS')
   {
       cmd = command('ffmpeg') + ' ' +
-          '-y -xerror ' +
+          '-user_agent "' + my_request.getUserAgent() + '" ' +
+          '-y -xerror -discard none ' +
           '-i "' + rtmpInputPath + '" ' +
           '-c copy -bsf:a aac_adtstoasc ' +
           '"' + filePath + '.mp4"';

tslint.json

@@ -21,6 +21,7 @@
     "no-any": false,
     "no-arg": true,
     "no-bitwise": true,
+    "prefer-conditional-expression": false,
     "space-within-parens": false,
     "no-object-literal-type-assertion": false,
     "no-console": [true,