1.1.13

Fix a login issue

LICENSE

@@ -1,4 +1,5 @@
 Copyright (c) 2015 Roel van Uden
+Copyright (c) 2016 Manoel <Godzil> Trapier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to

README.md

@@ -1,6 +1,6 @@
-# Crunchy.js: a fork of Deathspike/CrunchyRoll.js
+# Crunchy: a fork of Deathspike/CrunchyRoll.js
 
-*Crunchy.js* is capable of downloading *anime* episodes from the popular *CrunchyRoll* streaming service. An episode is stored in the original video format (often H.264 in a MP4 container) and the configured subtitle format (ASS or SRT).The two output files are then merged into a single MKV file.
+*Crunchy* is capable of downloading *anime* episodes from the popular *CrunchyRoll* streaming service. An episode is stored in the original video format (often H.264 in a MP4 container) and the configured subtitle format (ASS or SRT).The two output files are then merged into a single MKV file.
 
 ## Motivation
 
@@ -10,7 +10,7 @@
 
 This application is not endorsed or affliated with *CrunchyRoll*. The usage of this application enables episodes to be downloaded for offline convenience which may be forbidden by law in your country. Usage of this application may also cause a violation of the agreed *Terms of Service* between you and the stream provider. A tool is not responsible for your actions; please make an informed decision prior to using this application.
 
-**PLEASE USE THIS TOOL ONLY IF YOU HAVE A PREMIUM ACCOUNT**
+**PLEASE _ONLY_ USE THIS TOOL IF YOU HAVE A _PREMIUM ACCOUNT_**
 
 ## Configuration
 

package.json

@@ -1,6 +1,7 @@
 {
   "author": "Godzil",
-  "description": "Crunchy.js is a fork of Crunchyroll.js, capable of downloading anime episodes from the popular CrunchyRoll streaming service.",
+  "description": "Crunchy is a fork of Crunchyroll.js, capable of downloading anime episodes from the popular CrunchyRoll streaming service.",
+  "license": "MIT",
   "keywords": [
     "anime",
     "download",
@@ -11,16 +12,16 @@
     "type": "git",
     "url": "git://github.com/Godzil/crunchyroll.js.git"
   },
-  "version": "1.1.8",
+  "version": "1.1.13",
   "bin": {
     "crunchy": "./bin/crunchy"
   },
   "dependencies": {
     "big-integer": "1.4.4",
-    "cheerio": "0.18.0",
+    "cheerio": "0.22.0",
     "commander": "2.6.0",
     "mkdirp": "0.5.0",
-    "request": "2.53.0",
+    "request": "2.74.0",
     "xml2js": "0.4.5"
   },
   "devDependencies": {

src/episode.ts

@@ -7,15 +7,16 @@ import path = require('path');
 import subtitle from './subtitle/index';
 import video from './video/index';
 import xml2js = require('xml2js');
+import log  = require('./log');
 
 /**
  * Streams the episode to disk.
  */
-export default function(config: IConfig, address: string, done: (err: Error) => void) {
+export default function(config: IConfig, address: string, done: (err: Error, ign: boolean) => void) {
   scrapePage(config, address, (err, page) => {
-    if (err) return done(err);
+    if (err) return done(err, false);
     scrapePlayer(config, address, page.id, (err, player) => {
-      if (err) return done(err);
+      if (err) return done(err, false);
       download(config, page, player, done);
     });
   });
@@ -24,37 +25,72 @@ export default function(config: IConfig, address: string, done: (err: Error) =>
 /**
  * Completes a download and writes the message with an elapsed time.
  */
-function complete(message: string, begin: number, done: (err: Error) => void) {
+function complete(epName: string, message: string, begin: number, done: (err: Error, ign: boolean) => void) {
   var timeInMs = Date.now() - begin;
   var seconds = prefix(Math.floor(timeInMs / 1000) % 60, 2);
   var minutes = prefix(Math.floor(timeInMs / 1000 / 60) % 60, 2);
   var hours = prefix(Math.floor(timeInMs / 1000 / 60 / 60), 2);
-  console.log(message + ' (' + hours + ':' + minutes + ':' + seconds + ')');
-  done(null);
+  log.dispEpisode(epName, message + ' (' + hours + ':' + minutes + ':' + seconds + ')', true);
+  done(null, false);
+}
+
+/**
+ * Check if a file exist..
+ */
+function fileExist(path: string) {
+  try
+  {
+    fs.statSync(path); 
+    return true; 
+  } 
+  catch (e) { }
+  return false;
 }
 
 /**
  * Downloads the subtitle and video.
  */
-function download(config: IConfig, page: IEpisodePage, player: IEpisodePlayer, done: (err: Error) => void) {
+function download(config: IConfig, page: IEpisodePage, player: IEpisodePlayer, done: (err: Error, ign: boolean) => void) {
   var series = config.series || page.series;
-  var fileName = name(config, page, series);
+  series = series.replace("/","_").replace("'","_").replace(":","_");
+  var fileName = name(config, page, series, "").replace("/","_").replace("'","_").replace(":","_");
   var filePath = path.join(config.output || process.cwd(), series, fileName);
+  if (fileExist(filePath + ".mkv"))
+  {
+    var count = 0;
+    log.warn("File '"+fileName+"' already exist...");
+    do
+    {
+      count = count + 1;
+      fileName = name(config, page, series, "-" + count).replace("/","_").replace("'","_").replace(":","_");
+      filePath = path.join(config.output || process.cwd(), series, fileName);
+    } while(fileExist(filePath + ".mkv"))
+   log.warn("Renaming to '"+fileName+"'...");
+  }
+
   mkdirp(path.dirname(filePath), (err: Error) => {
-    if (err) return done(err);
+    if (err) return done(err, false);
     downloadSubtitle(config, player, filePath, err => {
-      if (err) return done(err);
+      if (err) return done(err, false);
       var now = Date.now();
-      console.log('Fetching ' + fileName);
-      downloadVideo(config, page, player, filePath, err => {
-        if (err) return done(err);
-        if (config.merge) return complete('Finished ' + fileName, now, done);
-        var isSubtited = Boolean(player.subtitle);
-        video.merge(config, isSubtited, player.video.file, filePath, player.video.mode, err => {
-          if (err) return done(err);
-          complete('Finished ' + fileName, now, done);
+			if (player.video.file != undefined)
+			{
+        log.dispEpisode(fileName, 'Fetching...', false);
+        downloadVideo(config, page, player, filePath, err => {
+          if (err) return done(err, false);
+          if (config.merge) return complete(fileName, 'Finished!', now, done);
+          var isSubtited = Boolean(player.subtitle);
+          video.merge(config, isSubtited, player.video.file, filePath, player.video.mode, err => {
+            if (err) return done(err, false);
+            complete(fileName, 'Finished!', now, done);
+          });
         });
-      });
+      }
+      else
+      {
+        log.dispEpisode(fileName, 'Ignoring: not released yet', true);
+        done(null, true);
+      }
     });
   });
 }
@@ -96,11 +132,13 @@ function downloadVideo(config: IConfig,
 /**
  * Names the file based on the config, page, series and tag.
  */
-function name(config: IConfig, page: IEpisodePage, series: string) {
-  var episode = (page.episode < 10 ? '0' : '') + page.episode;
-  var volume = (page.volume < 10 ? '0' : '') + page.volume;
+function name(config: IConfig, page: IEpisodePage, series: string, extra: string) {
+	var episodeNum = parseInt(page.episode, 10);
+	var volumeNum = parseInt(page.volume, 10);
+  var episode = (episodeNum < 10 ? '0' : '') + page.episode;
+  var volume = (volumeNum < 10 ? '0' : '') + page.volume;
   var tag = config.tag || 'CrunchyRoll';
-  return series + ' ' + volume + 'x' + episode + ' [' + tag + ']';
+  return series + ' - s' + volume + 'e' + episode +' - [' + tag + ']' + extra;  
 }
 
 /**
@@ -122,15 +160,29 @@ function scrapePage(config: IConfig, address: string, done: (err: Error, page?:
     if (err) return done(err);
     var $ = cheerio.load(result);
     var swf = /^([^?]+)/.exec($('link[rel=video_src]').attr('href'));
-    var regexp = /-\s+(?:Watch\s+)?(.+?)(?:\s+Season\s+([0-9]+))?(?:\s+-)?\s+Episode\s+([0-9]+)/;
-    var data = regexp.exec($('title').text());
-    if (!swf || !data) return done(new Error('Invalid page.'));
+    var regexp = /\s*([^\n\r\t\f]+)\n?\s*[^0-9]*([0-9][0-9.]*)?,?\n?\s\s*[^0-9]*((PV )?[S0-9][P0-9.]*[a-fA-F]?)/;
+    var look = $('#showmedia_about_media').text();
+    var seasonTitle = $('span[itemprop="title"]').text();
+    var data = regexp.exec(look);
+
+    if (!swf || !data)
+    {
+      log.warn('Something wrong in the page at '+address+' (data are: '+look+')');
+      log.warn('Setting Season to 0 and episode to \’0\’...');
+      done(null, {
+          id: id,
+          episode: "0",
+          series: seasonTitle,
+          swf: swf[1],
+          volume: "0"
+      });
+    }
     done(null, {
       id: id,
-      episode: parseInt(data[3], 10),
+      episode: data[3],
       series: data[1],
       swf: swf[1],
-      volume: parseInt(data[2], 10) || 1
+      volume: data[2] || "1"
     });
   });
 }

src/interface/IEpisodePage.d.ts

@@ -1,7 +1,7 @@
 interface IEpisodePage {
   id: number;
-  episode: number;
+  episode: string;
   series: string;
-  volume: number;
+  volume: string;
   swf: string;
 }

src/interface/ISeriesEpisode.d.ts

@@ -1,5 +1,5 @@
 interface ISeriesEpisode {
   address: string;
-  episode: number;
+  episode: string;
   volume: number;
 }

src/log.ts

@@ -0,0 +1,71 @@
+'use strict';
+import os = require('os');
+
+export function error(str: string)
+{
+  if (os.platform() === 'win32')
+  {
+    console.log(' * ERROR: ' + str);
+  }
+  else
+  {
+    /* Do more fancy output */
+    console.error(' \x1B[1;31m* ERROR\x1B[0m: ' + str);
+  }
+}
+
+export function info(str: string)
+{
+  if (os.platform() === 'win32')
+  {
+    console.log(' * INFO : ' + str);
+  }
+  else
+  {
+    /* Do more fancy output */
+    console.log(' \x1B[1;32m* INFO \x1B[0m: ' + str);
+  }
+}
+
+export function debug(str: string)
+{
+  if (os.platform() === 'win32')
+  {
+    console.log(' * DEBUG: ' + str);
+  }
+  else
+  {
+    /* Do more fancy output */
+    console.log(' \x1B[1;35m* DEBUG\x1B[0m: ' + str);
+  }
+}
+
+export function warn(str: string)
+{
+  if (os.platform() === 'win32')
+  {
+    console.log(' * WARN : ' + str);
+  }
+  else
+  {
+    /* Do more fancy output */
+    console.log(' \x1B[1;33m* WARN \x1B[0m: ' + str);
+  }
+}
+
+export function dispEpisode(name: string, status: string, addNL: boolean)
+{
+  if (os.platform() === 'win32')
+  {
+    process.stdout.write(' > ' + name + ' : ' + status + '\x1B[0G');
+  }
+  else
+  {
+    /* Do more fancy output */
+    process.stdout.write(' \x1B[1;33m> \x1B[37m' + name + '\x1B[0m : \x1B[33m' + status + '\x1B[0m\x1B[0G');
+  }
+  if (addNL)
+  {
+    console.log('');
+  }
+}

src/request.ts

@@ -1,6 +1,15 @@
 'use strict';
 import request = require('request');
+import cheerio = require('cheerio');
+import log  = require('./log');
+
 var isAuthenticated = false;
+var isPremium = false;
+
+var defaultHeaders: request.Headers = {
+  'User-Agent': 'Mozilla/5.0 (Windows NT 6.2; WOW64; rv:34.0) Gecko/20100101 Firefox/34.0',
+  'Connection': 'keep-alive'
+};
 
 /**
  * Performs a GET request for the resource.
@@ -33,20 +42,49 @@ export function post(config: IConfig, options: request.Options, done: (err: Erro
  */
 function authenticate(config: IConfig, done: (err: Error) => void) {
   if (isAuthenticated || !config.pass || !config.user) return done(null);
-  var options = {
-    form: {
-      formname: 'RpcApiUser_Login',
-      fail_url: 'https://www.crunchyroll.com/login',
-      name: config.user,
-      password: config.pass
-    },
+
+  /* Bypass the login page and send a login request directly */
+  var options =
+  {
+    headers: defaultHeaders,
     jar: true,
-    url: 'https://www.crunchyroll.com/?a=formhandler'
+    gzip: false,
+    url: 'https://www.crunchyroll.com/?a=formhandler&formname=RpcApiUser_Login&name=' + config.user + '&password=' + config.pass
   };
-  request.post(options, (err: Error) => {
+
+  request(options, (err: Error, rep: string, body: string) =>
+  {
     if (err) return done(err);
-    isAuthenticated = true;
-    done(null);
+    /* 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.
+     */
+    var options =
+    {
+      headers: defaultHeaders,
+      jar: true,
+      url: 'http://www.crunchyroll.com/'
+    };
+    request(options, (err: Error, rep: string, body: string) =>
+    {
+      if (err) return done(err);
+      var $ = cheerio.load(body);
+      /* Check if auth worked */
+      var regexps = /ga\(\'set\', \'dimension[5-8]\', \'([^']*)\'\);/g;
+      var dims = regexps.exec($('script').text());
+      for (var 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)
+      {
+        var error = $('ul.message, li.error').text();
+        return done(new Error('Authentication failed: ' + error));
+      }
+      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);
+    });
   });
 }
 
@@ -56,7 +94,8 @@ function authenticate(config: IConfig, done: (err: Error) => void) {
 function modify(options: string|request.Options): request.Options {
   if (typeof options !== 'string') {
     options.jar = true;
+    options.headers = defaultHeaders;
     return options;
   }
-  return {jar: true, url: options.toString()};
+  return {jar: true, headers: defaultHeaders, url: options.toString()};
 }

src/series.ts

@@ -5,6 +5,7 @@ import fs = require('fs');
 import request = require('./request');
 import path = require('path');
 import url = require('url');
+import log  = require('./log');
 var persistent = '.crpersistent';
 
 /**
@@ -19,14 +20,22 @@ export default function(config: IConfig, address: string, done: (err: Error) =>
       var i = 0;
       (function next() {
         if (i >= page.episodes.length) return done(null);
-        download(cache, config, address, page.episodes[i], err => {
+        download(cache, config, address, page.episodes[i], (err, ignored) => {
           if (err) return done(err);
-          var newCache = JSON.stringify(cache, null, '  ');
-          fs.writeFile(persistentPath, newCache, err => {
-            if (err) return done(err);
+          if ((ignored == false) || (ignored == undefined))
+          {
+            var newCache = JSON.stringify(cache, null, '  ');
+            fs.writeFile(persistentPath, newCache, err => {
+              if (err) return done(err);
+              i += 1;
+              next();
+            });
+          }
+          else
+          {
             i += 1;
             next();
-          });
+          }
         });
       })();
     });
@@ -40,14 +49,14 @@ function download(cache: {[address: string]: number},
   config: IConfig,
   baseAddress: string,
   item: ISeriesEpisode,
-  done: (err: Error) => void) {
-  if (!filter(config, item)) return done(null);
+  done: (err: Error, ign: boolean) => void) {
+  if (!filter(config, item)) return done(null, false);
   var address = url.resolve(baseAddress, item.address);
-  if (cache[address]) return done(null);
-  episode(config, address, err => {
-    if (err) return done(err);
+  if (cache[address]) return done(null, false);
+  episode(config, address, (err, ignored) => {
+    if (err) return done(err, false);
     cache[address] = Date.now();
-    done(null);
+    done(null, ignored);
   });
 }
 
@@ -57,8 +66,8 @@ function download(cache: {[address: string]: number},
 function filter(config: IConfig, item: ISeriesEpisode) {
   // Filter on chapter.
   var episodeFilter = config.episode;
-  if (episodeFilter > 0 && item.episode <= episodeFilter) return false;
-  if (episodeFilter < 0 && item.episode >= -episodeFilter) return false;
+  if (episodeFilter > 0 && parseInt(item.episode, 10) <= episodeFilter) return false;
+  if (episodeFilter < 0 && parseInt(item.episode, 10) >= -episodeFilter) return false;
 
   // Filter on volume.
   var volumeFilter = config.volume;
@@ -75,18 +84,19 @@ function page(config: IConfig, address: string, done: (err: Error, result?: ISer
     if (err) return done(err);
     var $ = cheerio.load(result);
     var title = $('span[itemprop=name]').text();
-    if (!title) return done(new Error('Invalid page.'));
+    if (!title) return done(new Error('Invalid page.(' + address + ')'));
+    log.info("Checking availability for " + title);
     var episodes: ISeriesEpisode[] = [];
     $('.episode').each((i, el) => {
       if ($(el).children('img[src*=coming_soon]').length) return;
       var volume = /([0-9]+)\s*$/.exec($(el).closest('ul').prev('a').text());
-      var regexp = /Episode\s+([0-9]+)\s*$/i;
+      var regexp = /Episode\s+((PV )?[S0-9][P0-9.]*[a-fA-F]?)\s*$/i;
       var episode = regexp.exec($(el).children('.series-title').text());
       var address = $(el).attr('href');
       if (!address || !episode) return;
       episodes.push({
         address: address,
-        episode: parseInt(episode[0], 10),
+        episode: episode[1],
         volume: volume ? parseInt(volume[0], 10) : 1
       });
     });

src/video/stream.ts

@@ -2,6 +2,7 @@
 import childProcess = require('child_process');
 import path = require('path');
 import os = require('os');
+import log  = require('../log');
 
 /**
  * Streams the video to disk.
@@ -19,7 +20,7 @@ import os = require('os');
  	}
  	else if (mode == "HLS")
  	{
- 		console.info("Experimental FFMPEG, MAY FAIL!!!");
+ 		log.debug("Experimental FFMPEG, MAY FAIL!!!");
  		var cmd=command("ffmpeg") + ' ' + 
  			'-i "' + rtmpInputPath + '" ' + 
  			'-c copy -bsf:a aac_adtstoasc ' + 
@@ -30,7 +31,7 @@ import os = require('os');
  	}
  	else
  	{
- 		console.error("No such mode: " + mode);
+ 		log.error("No such mode: " + mode);
  	}
 }
 

tsconfig.json

@@ -18,6 +18,7 @@
         "src/cli.ts",
         "src/episode.ts",
         "src/index.ts",
+        "src/log.ts",
         "src/interface/IConfig.d.ts",
         "src/interface/IConfigLine.d.ts",
         "src/interface/IConfigTask.d.ts",

tslint.json

@@ -47,8 +47,6 @@
     "no-var-requires": true,
     "one-line": [true,
       "check-catch",
-      "check-else",
-      "check-open-brace",
       "check-whitespace"
     ],
     "quotemark": [true, "single"],