1.1.11

- Update login mechanism to march CR september 2016 changes
Update login to match latest CR changes
2016-09-16 22:20:43 +01:00 · 2016-09-16 22:20:39 +01:00 · 2016-09-10 20:22:10 +01:00 · 2016-09-10 20:17:19 +01:00 · 2016-09-10 11:53:45 +01:00 · 2016-09-07 22:09:14 +01:00
40 changed files with 521 additions and 535 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,3 @@
 dist/
 node_modules/
-obj/
 typings/
-*.dat
-*.dll
-*.suo
-*.tmp
--- a/.npmignore
+++ b/.npmignore
@@ -1,16 +1,8 @@
 extras/
 node_modules/
-obj/
 src/
 typings/
-*.dat
-*.DotSettings
-*.dll
-*.map
-*.njsproj
-*.sln
-*.suo
-*.tmp
 ts.js
+tsconfig.json
 tsd.json
-tslint.json
+tslint.json
--- a/1
+++ b/1
@@ -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
--- a/1
+++ b/1
@@ -0,0 +1 @@
+README.md
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
-# CrunchyRoll.js
+# Crunchy.js: a fork of Deathspike/CrunchyRoll.js

-*CrunchyRoll.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.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.

 ## Motivation

@@ -10,6 +10,8 @@

 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**
+
 ## Configuration

 It is recommended to enable authentication (`-p` and `-u`) so your account permissions and settings are available for use. It is not possible to download non-free material without an account and premium subscription. Furthermore, the default account settings are used when downloading. If you want the highest quality videos, configure these preferences at https://www.crunchyroll.com/acct/?action=video.
@@ -26,30 +28,30 @@ Use the applicable instructions to install. Is your operating system not listed?

 ### Debian (Mint, Ubuntu, etc)

-1. Run in *Terminal*: `sudo apt-get install nodejs npm mkvtoolnix rtmpdump`
+1. Run in *Terminal*: `sudo apt-get install nodejs npm mkvtoolnix rtmpdump ffmpeg`
 2. Run in *Terminal*: `sudo ln -s /usr/bin/nodejs /usr/bin/node`
-3. Run in *Terminal*: `sudo npm install -g crunchyroll`
+3. Run in *Terminal*: `sudo npm install -g crunchy`

 ### Mac OS X

 1. Install *Homebrew* following the instructions at http://brew.sh/
-2. Run in *Terminal*: `brew install node mkvtoolnix rtmpdump`
-3. Run in *Terminal*: `npm install -g crunchyroll`
+2. Run in *Terminal*: `brew install node mkvtoolnix rtmpdump ffmpeg`
+3. Run in *Terminal*: `npm install -g crunchy`

 ### Windows

 1. Install *NodeJS* following the instructions at http://nodejs.org/
-3. Run in *Command Prompt*: `npm install -g crunchyroll`
+3. Run in *Command Prompt*: `npm install -g crunchy`

 ## Instructions

 Use the applicable instructions for the interface of your choice (currently limited to command-line).

-### Command-line Interface (`crunchyroll`)
+### Command-line Interface (`crunchy`)

-The [command-line interface](http://en.wikipedia.org/wiki/Command-line_interface) does not have a graphical component and is ideal for automation purposes and headless machines. The interface can run using a sequence of series addresses (the site address containing the episode listing), or with a batch-mode source file. The `crunchyroll --help` command will produce the following output:
+The [command-line interface](http://en.wikipedia.org/wiki/Command-line_interface) does not have a graphical component and is ideal for automation purposes and headless machines. The interface can run using a sequence of series addresses (the site address containing the episode listing), or with a batch-mode source file. The `crunchy --help` command will produce the following output:

-    Usage: crunchyroll [options]
+    Usage: crunchy [options]

    Options:

@@ -74,15 +76,15 @@ When no sequence of series addresses is provided, the batch-mode source file wil

 Download in batch-mode:

-    crunchyroll
+    crunchy

 Download *Fairy Tail* to the current work directory:

-    crunchyroll http://www.crunchyroll.com/fairy-tail
+    crunchy http://www.crunchyroll.com/fairy-tail

-Download *Fairy Tail* to `C:\Manga`:
+Download *Fairy Tail* to `C:\Anime`:

-    crunchyroll --output C:\Manga http://www.crunchyroll.com/fairy-tail
+    crunchy --output C:\Anime http://www.crunchyroll.com/fairy-tail

 #### Switches

@@ -112,10 +114,6 @@ Download *Fairy Tail* to `C:\Manga`:

 More information will be added at a later point. For now the recommendations are:

-* Visual Studio 2013 Update 4 (Core)
-* NodeJS Tools (Debugging)
-* TypeScript 1.4 (Language)
-* ReSharper 9.0+ (Hints/Formatting)
-* Web Essentials (TSLint)
+* Atom with `atom-typescript` and `linter-tslint` (and dependencies).

 Since this project uses TypeScript, compile with `node ts` or `npm install`.
--- a/bin/crunchyroll
+++ b/bin/crunchyroll
--- a/bin/ffmpeg.exe
+++ b/bin/ffmpeg.exe
--- a/crunchyroll.js.njsproj
+++ b/crunchyroll.js.njsproj
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <EnableTypeScript>True</EnableTypeScript>
-    <OutputPath>.</OutputPath>
-    <ProjectGuid>{c5cff68a-d733-4347-83e7-6e5fe58eb0e3}</ProjectGuid>
-    <ProjectHome />
-    <ProjectTypeGuids>{3AF33F2E-1136-4D97-BBB7-1795711AC8B8};{349c5851-65df-11da-9384-00065b846f21};{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}</ProjectTypeGuids>
-    <ProjectView>ShowAllFiles</ProjectView>
-    <SchemaVersion>2.0</SchemaVersion>
-    <StartupFile>cli.ts</StartupFile>
-    <TypeScriptModuleKind>CommonJS</TypeScriptModuleKind>
-    <TypeScriptNoImplicitAny>True</TypeScriptNoImplicitAny>
-    <TypeScriptOutDir>dist</TypeScriptOutDir>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">11.0</VisualStudioVersion>
-    <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
-    <WorkingDirectory>.</WorkingDirectory>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
-    <TypeScriptSourceMap>True</TypeScriptSourceMap>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-    <TypeScriptGeneratesDeclarations>True</TypeScriptGeneratesDeclarations>
-  </PropertyGroup>
-  <ItemGroup>
-    <TypeScriptCompile Include="src\cli.ts" />
-    <TypeScriptCompile Include="src\batch.ts" />
-    <TypeScriptCompile Include="src\episode.ts" />
-    <TypeScriptCompile Include="src\index.ts" />
-    <TypeScriptCompile Include="src\request.ts" />
-    <TypeScriptCompile Include="src\series.ts" />
-    <TypeScriptCompile Include="src\subtitle\decode.ts" />
-    <TypeScriptCompile Include="src\subtitle\formats\ass.ts" />
-    <TypeScriptCompile Include="src\subtitle\formats\index.ts" />
-    <TypeScriptCompile Include="src\subtitle\formats\srt.ts" />
-    <TypeScriptCompile Include="src\subtitle\index.ts" />
-    <TypeScriptCompile Include="src\typings.ts" />
-    <TypeScriptCompile Include="src\video\index.ts" />
-    <TypeScriptCompile Include="src\video\merge.ts" />
-    <TypeScriptCompile Include="src\video\stream.ts" />
-    <TypeScriptCompile Include="typings\big-integer\big-integer.d.ts" />
-    <TypeScriptCompile Include="typings\cheerio\cheerio.d.ts" />
-    <TypeScriptCompile Include="typings\commander\commander.d.ts" />
-    <TypeScriptCompile Include="typings\form-data\form-data.d.ts" />
-    <TypeScriptCompile Include="typings\mkdirp\mkdirp.d.ts" />
-    <TypeScriptCompile Include="typings\node\node.d.ts" />
-    <TypeScriptCompile Include="typings\request\request.d.ts" />
-    <TypeScriptCompile Include="typings\xml2js\xml2js.d.ts" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="src\" />
-    <Folder Include="src\subtitle\" />
-    <Folder Include="src\subtitle\formats\" />
-    <Folder Include="src\video\" />
-    <Folder Include="typings" />
-    <Folder Include="typings\big-integer\" />
-    <Folder Include="typings\cheerio\" />
-    <Folder Include="typings\commander\" />
-    <Folder Include="typings\form-data\" />
-    <Folder Include="typings\mkdirp\" />
-    <Folder Include="typings\node" />
-    <Folder Include="typings\request\" />
-    <Folder Include="typings\xml2js\" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.targets" Condition="False" />
-  <Import Project="$(VSToolsPath)\Node.js Tools\Microsoft.NodejsTools.targets" />
-  <ProjectExtensions>
-    <VisualStudio>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}">
-        <WebProjectProperties>
-          <AutoAssignPort>True</AutoAssignPort>
-          <CustomServerUrl>http://localhost:1337</CustomServerUrl>
-          <DevelopmentServerPort>0</DevelopmentServerPort>
-          <DevelopmentServerVPath>/</DevelopmentServerVPath>
-          <IISUrl>http://localhost:48022/</IISUrl>
-          <NTLMAuthentication>False</NTLMAuthentication>
-          <SaveServerSettingsInUserFile>False</SaveServerSettingsInUserFile>
-          <UseCustomServer>True</UseCustomServer>
-          <UseIIS>False</UseIIS>
-        </WebProjectProperties>
-      </FlavorProperties>
-      <FlavorProperties GUID="{349c5851-65df-11da-9384-00065b846f21}" User="">
-        <WebProjectProperties>
-          <AlwaysStartWebServerOnDebug>False</AlwaysStartWebServerOnDebug>
-          <AspNetDebugging>True</AspNetDebugging>
-          <EnableENC>False</EnableENC>
-          <ExternalProgram />
-          <NativeDebugging>False</NativeDebugging>
-          <SilverlightDebugging>False</SilverlightDebugging>
-          <SQLDebugging>False</SQLDebugging>
-          <StartAction>CurrentPage</StartAction>
-          <StartCmdLineArguments />
-          <StartExternalURL />
-          <StartPageUrl />
-          <StartWorkingDirectory />
-        </WebProjectProperties>
-      </FlavorProperties>
-    </VisualStudio>
-  </ProjectExtensions>
-</Project>
--- a/crunchyroll.js.sln
+++ b/crunchyroll.js.sln
@@ -1,22 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9092AA53-FB77-4645-B42D-1CCCA6BD08BD}") = "crunchyroll.js", "crunchyroll.js.njsproj", "{C5CFF68A-D733-4347-83E7-6E5FE58EB0E3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C5CFF68A-D733-4347-83E7-6E5FE58EB0E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C5CFF68A-D733-4347-83E7-6E5FE58EB0E3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C5CFF68A-D733-4347-83E7-6E5FE58EB0E3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C5CFF68A-D733-4347-83E7-6E5FE58EB0E3}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
--- a/crunchyroll.js.sln.DotSettings
+++ b/crunchyroll.js.sln.DotSettings
@@ -1,65 +0,0 @@
-<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:String x:Key="/Default/CodeEditing/Intellisense/CodeCompletion/IntellisenseGloballyEnabled/IntellisenseEnabled/@EntryValue">Disabled</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=DeclarationHides/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=InconsistentNaming/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=NotAllPathsReturnValue/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=RedundantQualifier/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	
-	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SpecifyVariableTypeExplicitly/@EntryIndexedValue">DO_NOT_SHOW</s:String>
-	<s:String x:Key="/Default/CodeInspection/TypeScriptInspections/Level/@EntryValue">TypeScript14</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=TypeScript/@EntryIndexedValue">&lt;?xml version="1.0" encoding="utf-16"?&gt;&lt;Profile name="TypeScript"&gt;&lt;FormatAttributeQuoteDescriptor&gt;True&lt;/FormatAttributeQuoteDescriptor&gt;&lt;JsReformatCode&gt;True&lt;/JsReformatCode&gt;&lt;JsFormatDocComments&gt;True&lt;/JsFormatDocComments&gt;&lt;JsInsertSemicolon&gt;True&lt;/JsInsertSemicolon&gt;&lt;RemoveRedundantQualifiersTs&gt;True&lt;/RemoveRedundantQualifiersTs&gt;&lt;OptimizeImportsTs&gt;True&lt;/OptimizeImportsTs&gt;&lt;OptimizeReferenceCommentsTs&gt;True&lt;/OptimizeReferenceCommentsTs&gt;&lt;PublicModifierStyleTs&gt;True&lt;/PublicModifierStyleTs&gt;&lt;RelativePathStyleTs&gt;True&lt;/RelativePathStyleTs&gt;&lt;TypeAnnotationStyleTs&gt;True&lt;/TypeAnnotationStyleTs&gt;&lt;/Profile&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeCleanup/SilentCleanupProfile/@EntryValue">TypeScript</s:String>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/FORCE_CONTROL_STATEMENTS_BRACES/@EntryValue">ONLY_FOR_MULTILINE</s:String>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/KEEP_BLANK_LINES_BETWEEN_DECLARATIONS/@EntryValue">1</s:Int64>
-	<s:Int64 x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/KEEP_BLANK_LINES_IN_CODE/@EntryValue">1</s:Int64>
-	<s:String x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/QUOTE_STYLE/@EntryValue">SingleQuoted</s:String>
-	
-	
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/SPACE_WITHIN_OBJECT_LITERAL_BRACES/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/JavaScriptCodeFormatting/STICK_COMMENT/@EntryValue">False</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FCONSTANT/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FBLOCK_005FSCOPE_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FCONSTRUCTOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLABEL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FLOCAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FOBJECT_005FPROPERTY_005FOF_005FFUNCTION/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=JS_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FCLASS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FENUM_005FMEMBER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="I" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FINTERFACE_005FFOR_005FJS_005FGLOBAL_005FVARIABLE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FEXPORTED/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FMODULE_005FLOCAL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPRIVATE_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPROTECTED_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FMEMBER_005FACCESSOR/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FSTATIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FPUBLIC_005FTYPE_005FMETHOD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/JavaScriptNaming/UserRules/=TS_005FTYPE_005FPARAMETER/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="T" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FHTML_005FCONTROL/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FNAME/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/WebNaming/UserRules/=ASP_005FTAG_005FPREFIX/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=NAMESPACE_005FALIAS/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FFIELD/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:String x:Key="/Default/CodeStyle/Naming/XamlNaming/UserRules/=XAML_005FRESOURCE/@EntryIndexedValue">&lt;Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /&gt;</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/TypeScriptCodeStyle/ExplicitPublicModifier/@EntryValue">True</s:Boolean>
-	<s:String x:Key="/Default/CodeStyle/TypeScriptCodeStyle/FileReferenceStyle/@EntryValue">RelativeDotSlash</s:String>
-	<s:Boolean x:Key="/Default/CodeStyle/TypeScriptCodeStyle/NoImplicitAny/@EntryValue">True</s:Boolean>
-	
-	<s:Boolean x:Key="/Default/CodeStyle/TypeScriptCodeStyle/PreferUsingAliases/@EntryValue">False</s:Boolean>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=AAA631615CEE9646AA8766F222F9457C/@KeyIndexDefined">True</s:Boolean>
-	<s:String x:Key="/Default/Environment/InjectedLayers/FileInjectedLayer/=AAA631615CEE9646AA8766F222F9457C/AbsolutePath/@EntryValue">C:\Dropbox\Github\crunchyroll.js\crunchyroll.js.sln.DotSettings</s:String>
-	<s:Boolean x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileAAA631615CEE9646AA8766F222F9457C/@KeyIndexDefined">True</s:Boolean>
-	<s:Double x:Key="/Default/Environment/InjectedLayers/InjectedLayerCustomization/=FileAAA631615CEE9646AA8766F222F9457C/RelativePriority/@EntryValue">1</s:Double></wpf:ResourceDictionary>
--- a/package.json
+++ b/package.json
@@ -1,36 +1,37 @@
 {
-  "author": "Roel van Uden",
-  "description": "CrunchyRoll.js is capable of downloading anime episodes from the popular CrunchyRoll streaming service.",
+  "author": "Godzil",
+  "description": "Crunchy.js is a fork of Crunchyroll.js, capable of downloading anime episodes from the popular CrunchyRoll streaming service.",
+  "license": "MIT",
  "keywords": [
    "anime",
    "download",
    "crunchyroll"
  ],
-  "name": "crunchyroll",
+  "name": "crunchy",
  "repository": {
    "type": "git",
-    "url": "git://github.com/Deathspike/crunchyroll.js.git"
+    "url": "git://github.com/Godzil/crunchyroll.js.git"
  },
-  "version": "1.1.1",
+  "version": "1.1.11",
  "bin": {
-    "crunchyroll": "./bin/crunchyroll"
+    "crunchy": "./bin/crunchy"
  },
  "dependencies": {
-    "big-integer": "^1.4.3",
-    "cheerio": "^0.18.0",
-    "commander": "^2.6.0",
-    "mkdirp": "^0.5.0",
-    "request": "^2.53.0",
-    "xml2js": "^0.4.4"
+    "big-integer": "1.4.4",
+    "cheerio": "0.18.0",
+    "commander": "2.6.0",
+    "mkdirp": "0.5.0",
+    "request": "2.53.0",
+    "xml2js": "0.4.5"
  },
  "devDependencies": {
-    "tsd": "^0.5.7",
-    "tslint": "^2.1.0",
-    "typescript": "^1.4.1"
+    "tsd": "0.5.7",
+    "tslint": "2.3.0-beta",
+    "typescript": "1.5.0-beta"
  },
  "scripts": {
-    "prepublish": "npm run tsd && node ts",
-    "test":  "node ts --only-test",
-    "tsd": "./node_modules/.bin/tsd reinstall --overwrite"
+    "prepublish": "npm run tsd && tsc",
+    "test": "node ts --only-test",
+    "tsd": "tsd reinstall -o -s"
  }
 }
--- a/src/batch.ts
+++ b/src/batch.ts
@@ -1,15 +1,13 @@
 'use strict';
-export = main;
 import commander = require('commander');
 import fs = require('fs');
 import path = require('path');
-import series = require('./series');
-import typings = require('./typings');
+import series from './series';

 /**
 * Streams the batch of series to disk.
 */
-function main(args: string[], done: (err?: Error) => void) {
+export default function(args: string[], done: (err?: Error) => void) {
  var config = parse(args);
  var batchPath = path.join(config.output || process.cwd(), 'CrunchyRoll.txt');
  tasks(config, batchPath, (err, tasks) => {
@@ -41,14 +39,15 @@ function split(value: string): string[] {
      previous = i + 1;
    }
  }
-  pieces.push(value.substring(previous, i).match(/^"?(.+?)"?$/)[1]);
+  var lastPiece = value.substring(previous, i).match(/^"?(.+?)"?$/);
+  if (lastPiece) pieces.push(lastPiece[1]);
  return pieces;
 }

 /**
 * Parses the configuration or reads the batch-mode file for tasks.
 */
-function tasks(config: typings.IConfigLine, batchPath: string, done: (err: Error, tasks?: typings.IConfigTask[]) => void) {
+function tasks(config: IConfigLine, batchPath: string, done: (err: Error, tasks?: IConfigTask[]) => void) {
  if (config.args.length) {
    return done(null, config.args.map(address => {
      return {address: address, config: config};
@@ -58,7 +57,7 @@ function tasks(config: typings.IConfigLine, batchPath: string, done: (err: Error
    if (!exists) return done(null, []);
    fs.readFile(batchPath, 'utf8', (err, data) => {
      if (err) return done(err);
-      var map: typings.IConfigTask[] = [];
+      var map: IConfigTask[] = [];
      data.split(/\r?\n/).forEach(line => {
        if (/^(\/\/|#)/.test(line)) return;
        var lineConfig = parse(process.argv.concat(split(line)));
@@ -75,7 +74,7 @@ function tasks(config: typings.IConfigLine, batchPath: string, done: (err: Error
 /**
 * Parses the arguments and returns a configuration.
 */
-function parse(args: string[]): typings.IConfigLine {
+function parse(args: string[]): IConfigLine {
  return new commander.Command().version(require('../package').version)
    // Authentication
    .option('-p, --pass <s>', 'The password.')
@@ -92,4 +91,4 @@ function parse(args: string[]): typings.IConfigLine {
    .option('-s, --series <s>', 'The series override.')
    .option('-t, --tag <s>', 'The subgroup. (Default: CrunchyRoll)')
    .parse(args);
-}
+}
--- a/src/cli.ts
+++ b/src/cli.ts
@@ -1,6 +1,6 @@
 'use strict';
-import batch = require('./batch');
+import batch from './batch';

 batch(process.argv, (err: any) => {
  if (err) console.error(err.stack || err);
-});
+});
--- a/src/episode.ts
+++ b/src/episode.ts
@@ -1,23 +1,21 @@
 'use strict';
-export = main;
 import cheerio = require('cheerio');
 import fs = require('fs');
 import mkdirp = require('mkdirp');
 import request = require('./request');
 import path = require('path');
-import subtitle = require('./subtitle/index');
-import typings = require('./typings');
-import video = require('./video/index');
+import subtitle from './subtitle/index';
+import video from './video/index';
 import xml2js = require('xml2js');

 /**
 * Streams the episode to disk.
 */
-function main(config: typings.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);
    });
  });
@@ -26,36 +24,72 @@ function main(config: typings.IConfig, address: string, done: (err: Error) => vo
 /**
 * Completes a download and writes the message with an elapsed time.
 */
-function complete(message: string, begin: number, done: (err: Error) => void) {
+function complete(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);
+  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: typings.IConfig, page: typings.IEpisodePage, player: typings.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;
+    console.info("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"))
+    console.info("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);
-        video.merge(config, player.video.file, filePath, err => {
-          if (err) return done(err);
-          complete('Finished ' + fileName, now, done);
+			if (player.video.file != undefined)
+			{
+        console.log('Fetching ' + fileName);
+        downloadVideo(config, page, player, filePath, err => {
+          if (err) return done(err, false);
+          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, false);
+            complete('Finished ' + fileName, now, done);
+          });
        });
-      });
+      }
+      else
+      {
+        console.log('Ignoring ' + fileName + ': not released yet');
+        done(null, true);
+      }
    });
  });
 }
@@ -63,8 +97,9 @@ function download(config: typings.IConfig, page: typings.IEpisodePage, player: t
 /**
 * Saves the subtitles to disk.
 */
-function downloadSubtitle(config: typings.IConfig, player: typings.IEpisodePlayer, filePath: string, done: (err: Error) => void) {
+function downloadSubtitle(config: IConfig, player: IEpisodePlayer, filePath: string, done: (err?: Error) => void) {
  var enc = player.subtitle;
+  if (!enc) return done();
  subtitle.decode(enc.id, enc.iv, enc.data, (err, data) => {
    if (err) return done(err);
    var formats = subtitle.formats;
@@ -79,27 +114,30 @@ function downloadSubtitle(config: typings.IConfig, player: typings.IEpisodePlaye
 /**
 * Streams the video to disk.
 */
-function downloadVideo(config: typings.IConfig,
-  page: typings.IEpisodePage,
-  player: typings.IEpisodePlayer,
+function downloadVideo(config: IConfig,
+  page: IEpisodePage,
+  player: IEpisodePlayer,
  filePath: string,
  done: (err: Error) => void) {
  video.stream(
    player.video.host,
    player.video.file,
    page.swf,
-    filePath + path.extname(player.video.file),
+    filePath, path.extname(player.video.file),
+    player.video.mode,
    done);
 }

 /**
 * Names the file based on the config, page, series and tag.
 */
-function name(config: typings.IConfig, page: typings.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;  
 }

 /**
@@ -114,22 +152,36 @@ function prefix(value: number|string, length: number) {
 /**
 * Requests the page data and scrapes the id, episode, series and swf.
 */
-function scrapePage(config: typings.IConfig, address: string, done: (err: Error, page?: typings.IEpisodePage) => void) {
+function scrapePage(config: IConfig, address: string, done: (err: Error, page?: IEpisodePage) => void) {
  var id = parseInt((address.match(/[0-9]+$/) || ['0'])[0], 10);
  if (!id) return done(new Error('Invalid address.'));
  request.get(config, address, (err, result) => {
    if (err) return done(err);
    var $ = cheerio.load(result);
    var swf = /^([^?]+)/.exec($('link[rel=video_src]').attr('href'));
-    var regexp = /Watch\s+(.+?)(?:\s+Season\s+([0-9]+))?\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)
+    {
+      console.info('Something wrong in the page at '+address+' (data are: '+look+')');
+      console.info('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"
    });
  });
 }
@@ -137,7 +189,7 @@ function scrapePage(config: typings.IConfig, address: string, done: (err: Error,
 /**
 * Requests the player data and scrapes the subtitle and video data.
 */
-function scrapePlayer(config: typings.IConfig, address: string, id: number, done: (err: Error, player?: typings.IEpisodePlayer) => void) {
+function scrapePlayer(config: IConfig, address: string, id: number, done: (err: Error, player?: IEpisodePlayer) => void) {
  var url = address.match(/^(https?:\/\/[^\/]+)/);
  if (!url) return done(new Error('Invalid address.'));
  request.post(config, {
@@ -148,16 +200,23 @@ function scrapePlayer(config: typings.IConfig, address: string, id: number, done
    xml2js.parseString(result, {
      explicitArray: false,
      explicitRoot: false
-    }, (err: Error, player: typings.IEpisodePlayerConfig) => {
+    }, (err: Error, player: IEpisodePlayerConfig) => {
      if (err) return done(err);
      try {
+        var isSubtitled = Boolean(player['default:preload'].subtitle);
+		var streamMode="RTMP";
+		if (player['default:preload'].stream_info.host == "")
+		{
+			streamMode="HLS";
+		}
        done(null, {
-          subtitle: {
+          subtitle: isSubtitled ? {
            id: parseInt(player['default:preload'].subtitle.$.id, 10),
            iv: player['default:preload'].subtitle.iv,
            data: player['default:preload'].subtitle.data
-          },
+          } : null,
          video: {
+            mode: streamMode,
            file: player['default:preload'].stream_info.file,
            host: player['default:preload'].stream_info.host
          }
@@ -167,4 +226,4 @@ function scrapePlayer(config: typings.IConfig, address: string, id: number, done
      }
    });
  });
-}
+}
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,4 +1,5 @@
 'use strict';
-export import batch = require('./batch');
-export import episode = require('./episode');
-export import series = require('./series');
+import batch from './batch';
+import episode from './episode';
+import series from './series';
+export {batch, episode, series};
--- a/src/interface/IConfig.d.ts
+++ b/src/interface/IConfig.d.ts
@@ -0,0 +1,16 @@
+interface IConfig {
+  // Authentication
+  pass?: string;
+  user?: string;
+  // Disables
+  cache?: boolean;
+  merge?: boolean;
+  // Filters
+  episode?: number;
+  volume?: number;
+  // Settings
+  format?: string;
+  output?: string;
+  series?: string;
+  tag?: string;
+}
--- a/src/interface/IConfigLine.d.ts
+++ b/src/interface/IConfigLine.d.ts
@@ -0,0 +1,3 @@
+interface IConfigLine extends IConfig {
+  args: string[];
+}
--- a/src/interface/IConfigTask.d.ts
+++ b/src/interface/IConfigTask.d.ts
@@ -0,0 +1,4 @@
+interface IConfigTask {
+  address: string;
+  config: IConfigLine;
+}
--- a/src/interface/IEpisodePage.d.ts
+++ b/src/interface/IEpisodePage.d.ts
@@ -0,0 +1,7 @@
+interface IEpisodePage {
+  id: number;
+  episode: string;
+  series: string;
+  volume: string;
+  swf: string;
+}
--- a/src/interface/IEpisodePlayer.d.ts
+++ b/src/interface/IEpisodePlayer.d.ts
@@ -0,0 +1,12 @@
+interface IEpisodePlayer {
+  subtitle?: {
+    id: number;
+    iv: string;
+    data: string;
+  };
+  video: {
+    mode: string;
+    file: string;
+    host: string;
+  };
+}
--- a/src/interface/IEpisodePlayerConfig.d.ts
+++ b/src/interface/IEpisodePlayerConfig.d.ts
@@ -0,0 +1,15 @@
+interface IEpisodePlayerConfig {
+  'default:preload': {
+    subtitle: {
+      $: {
+        id: string;
+      };
+      iv: string;
+      data: string;
+    };
+    stream_info: {
+      file: string;
+      host: string;
+    };
+  };
+}
--- a/src/interface/IFormatterTable.d.ts
+++ b/src/interface/IFormatterTable.d.ts
@@ -0,0 +1,3 @@
+interface IFormatterTable {
+  [key: string]: (input: string|Buffer, done: (err: Error, subtitle?: string) => void) => void;
+}
--- a/src/interface/ISeries.d.ts
+++ b/src/interface/ISeries.d.ts
@@ -0,0 +1,4 @@
+interface ISeries {
+  episodes: ISeriesEpisode[];
+  series: string;
+}
--- a/src/interface/ISeriesEpisode.d.ts
+++ b/src/interface/ISeriesEpisode.d.ts
@@ -0,0 +1,5 @@
+interface ISeriesEpisode {
+  address: string;
+  episode: string;
+  volume: number;
+}
--- a/src/interface/ISubtitle.d.ts
+++ b/src/interface/ISubtitle.d.ts
@@ -0,0 +1,13 @@
+interface ISubtitle {
+  $: {
+    title: string;
+    wrap_style: string;
+    play_res_x: string;
+    play_res_y: string;
+    id: string;
+    lang_string: string;
+    created: string;
+  };
+  events: ISubtitleEvent;
+  styles: ISubtitleStyle;
+}
--- a/src/interface/ISubtitleEvent.d.ts
+++ b/src/interface/ISubtitleEvent.d.ts
@@ -0,0 +1,15 @@
+interface ISubtitleEvent {
+  event: {
+    $: {
+      end: string;
+      start: string;
+      style: string;
+      name: string;
+      margin_l: string;
+      margin_r: string;
+      margin_v: string;
+      effect: string;
+      text: string;
+    };
+  }[];
+}
--- a/src/interface/ISubtitleStyle.d.ts
+++ b/src/interface/ISubtitleStyle.d.ts
@@ -0,0 +1,29 @@
+interface ISubtitleStyle {
+  style: {
+    $: {
+      name: string;
+      font_name: string;
+      font_size: string;
+      primary_colour: string;
+      secondary_colour: string;
+      outline_colour: string;
+      back_colour: string;
+      bold: string;
+      italic: string;
+      underline: string;
+      strikeout: string;
+      scale_x: string;
+      scale_y: string;
+      spacing: string;
+      angle: string;
+      border_style: string;
+      outline: string;
+      shadow: string;
+      alignment: string;
+      margin_l: string;
+      margin_r: string;
+      margin_v: string;
+      encoding: string;
+    };
+  }[];
+}
--- a/src/request.ts
+++ b/src/request.ts
@@ -1,12 +1,19 @@
 'use strict';
 import request = require('request');
-import typings = require('./typings');
+import cheerio = require('cheerio');
+
 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.
 */
-export function get(config: typings.IConfig, options: request.Options, done: (err: Error, result?: string) => void) {
+export function get(config: IConfig, options: request.Options, done: (err: Error, result?: string) => void) {
  authenticate(config, err => {
    if (err) return done(err);
    request.get(modify(options), (err: Error, response: any, body: any) => {
@@ -19,7 +26,7 @@ export function get(config: typings.IConfig, options: request.Options, done: (er
 /**
 * Performs a POST request for the resource.
 */
-export function post(config: typings.IConfig, options: request.Options, done: (err: Error, result?: string) => void) {
+export function post(config: IConfig, options: request.Options, done: (err: Error, result?: string) => void) {
  authenticate(config, err => {
    if (err) return done(err);
    request.post(modify(options), (err: Error, response: any, body: any) => {
@@ -32,23 +39,73 @@ export function post(config: typings.IConfig, options: request.Options, done: (e
 /**
 * Authenticates using the configured pass and user.
 */
-function authenticate(config: typings.IConfig, done: (err: Error) => void) {
+function authenticate(config: IConfig, done: (err: Error) => void) {
  if (isAuthenticated || !config.pass || !config.user) return done(null);
+  /* First just request the login page */
  var options = {
-    form: {
-      formname: 'RpcApiUser_Login',
-      fail_url: 'https://www.crunchyroll.com/login',
-      name: config.user,
-      password: config.pass
-    },
+    headers: defaultHeaders,
    jar: true,
-    url: 'https://www.crunchyroll.com/?a=formhandler'
-  };
-  request.post(options, (err: Error) => {
+    url: 'https://www.crunchyroll.com/login'
+  }
+  
+  request(options, (err: Error, rep: any, body: any) => 
+  {
    if (err) return done(err);
-    isAuthenticated = true;
-    done(null);
-  });
+    var $ = cheerio.load(body);
+    
+    /* Get the token from the login page */
+    var token = $('input[name="login_form[_token]"]').attr("value");
+    if (token == "") return done(new Error("Can't find token!"));
+
+    var options =
+    {
+      headers: defaultHeaders,
+      form:
+      {
+        'login_form[redirect_url]': '/',
+        'login_form[name]': config.user,
+        'login_form[password]': config.pass,
+        'login_form[_token]': token,
+      },
+      jar: true,
+      gzip: false,
+      url: 'https://www.crunchyroll.com/login'
+    };
+    request.post(options, (err: Error, rep: string, body: string) =>
+    {
+      if (err) return done(err);
+      /* 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) { console.info("Do not use this app without a premium account."); }
+        else { console.info("You have a premium account! Good!"); }
+        done(null);
+      })
+    })
+  })
 }

 /**
@@ -57,7 +114,8 @@ function authenticate(config: typings.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()};
+}
--- a/src/series.ts
+++ b/src/series.ts
@@ -1,18 +1,16 @@
 'use strict';
-export = main;
 import cheerio = require('cheerio');
-import episode = require('./episode');
+import episode from './episode';
 import fs = require('fs');
 import request = require('./request');
 import path = require('path');
-import typings = require('./typings');
 import url = require('url');
 var persistent = '.crpersistent';

 /**
 * Streams the series to disk.
 */
-function main(config: typings.IConfig, address: string, done: (err: Error) => void) {
+export default function(config: IConfig, address: string, done: (err: Error) => void) {
  var persistentPath = path.join(config.output || process.cwd(), persistent);
  fs.readFile(persistentPath, 'utf8', (err, contents) => {
    var cache = config.cache ? {} : JSON.parse(contents || '{}');
@@ -21,14 +19,22 @@ function main(config: typings.IConfig, address: string, done: (err: Error) => vo
      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();
-          });
+          }
        });
      })();
    });
@@ -39,28 +45,28 @@ function main(config: typings.IConfig, address: string, done: (err: Error) => vo
 * Downloads the episode.
 */
 function download(cache: {[address: string]: number},
-  config: typings.IConfig,
+  config: IConfig,
  baseAddress: string,
-  item: typings.ISeriesEpisode,
-  done: (err: Error) => void) {
-  if (!filter(config, item)) return done(null);
+  item: ISeriesEpisode,
+  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);
  });
 }

 /**
 * Filters the item based on the configuration.
 */
-function filter(config: typings.IConfig, item: typings.ISeriesEpisode) {
+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;
@@ -72,26 +78,26 @@ function filter(config: typings.IConfig, item: typings.ISeriesEpisode) {
 /**
 * Requests the page and scrapes the episodes and series.
 */
-function page(config: typings.IConfig, address: string, done: (err: Error, result?: typings.ISeries) => void) {
+function page(config: IConfig, address: string, done: (err: Error, result?: ISeries) => void) {
  request.get(config, address, (err, result) => {
    if (err) return done(err);
    var $ = cheerio.load(result);
    var title = $('span[itemprop=name]').text();
-    if (!title) return done(new Error('Invalid page.'));
-    var episodes: typings.ISeriesEpisode[] = [];
+    if (!title) return done(new Error('Invalid page.(' + address + ')'));
+    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
      });
    });
    done(null, {episodes: episodes.reverse(), series: title});
  });
-}
+}
--- a/src/subtitle/decode.ts
+++ b/src/subtitle/decode.ts
@@ -1,6 +1,5 @@
 /* tslint:disable:no-bitwise false */
 'use strict';
-export = main;
 import crypto = require('crypto');
 import bigInt = require('big-integer');
 import zlib = require('zlib');
@@ -8,7 +7,7 @@ import zlib = require('zlib');
 /**
 * Decodes the data.
 */
-function main(id: number, iv: Buffer|string, data: Buffer|string, done: (err?: Error, result?: Buffer) => void) {
+ export default function(id: number, iv: Buffer|string, data: Buffer|string, done: (err?: Error, result?: Buffer) => void) {
  try {
    decompress(decrypt(id, iv, data), done);
  } catch (e) {
@@ -73,4 +72,4 @@ function secret(size: number, modulo: number, firstSeed: number, secondSeed: num
    previousValue = oldValue;
  }
  return result;
-}
+}
--- a/src/subtitle/formats/ass.ts
+++ b/src/subtitle/formats/ass.ts
@@ -1,16 +1,14 @@
 'use strict';
-export = main;
 import xml2js = require('xml2js');
-import typings = require('../../typings');

 /**
 * Converts an input buffer to a SubStation Alpha subtitle.
 */
-function main(input: string|Buffer, done: (err: Error, subtitle?: string) => void) {
+export default function(input: string|Buffer, done: (err: Error, subtitle?: string) => void) {
  xml2js.parseString(input.toString(), {
    explicitArray: false,
    explicitRoot: false
-  }, (err: Error, xml: typings.ISubtitle) => {
+  }, (err: Error, xml: ISubtitle) => {
    if (err) return done(err);
    try {
      done(null, script(xml) + '\n' +
@@ -25,11 +23,11 @@ function main(input: string|Buffer, done: (err: Error, subtitle?: string) => voi
 /**
 * Converts the event block.
 */
-function event(block: typings.ISubtitleEvent): string {
+function event(block: ISubtitleEvent): string {
  var format = 'Layer,Start,End,Style,Name,MarginL,MarginR,MarginV,Effect,Text';
  return '[Events]\n' +
    'Format: ' + format + '\n' +
-    block.event.map(style => ('Dialogue: 0,' +
+    [].concat(block.event).map(style => ('Dialogue: 0,' +
      style.$.start + ',' +
      style.$.end + ',' +
      style.$.style + ',' +
@@ -44,7 +42,7 @@ function event(block: typings.ISubtitleEvent): string {
 /**
 * Converts the script block.
 */
-function script(block: typings.ISubtitle): string {
+function script(block: ISubtitle): string {
  return '[Script Info]\n' +
    'Title: ' + block.$.title + '\n' +
    'ScriptType: v4.00+\n' +
@@ -59,14 +57,14 @@ function script(block: typings.ISubtitle): string {
 /**
 * Converts the style block.
 */
-function style(block: typings.ISubtitleStyle): string {
+function style(block: ISubtitleStyle): string {
  var format = 'Name,Fontname,Fontsize,PrimaryColour,SecondaryColour,' +
    'OutlineColour,BackColour,Bold,Italic,Underline,StrikeOut,ScaleX,' +
    'ScaleY,Spacing,Angle,BorderStyle,Outline,Shadow,Alignment,' +
    'MarginL,MarginR,MarginV,Encoding';
  return '[V4+ Styles]\n' +
    'Format: ' + format + '\n' +
-    block.style.map(style => 'Style: ' +
+    [].concat(block.style).map(style => 'Style: ' +
      style.$.name + ',' +
      style.$.font_name + ',' +
      style.$.font_size + ',' +
@@ -90,4 +88,4 @@ function style(block: typings.ISubtitleStyle): string {
      style.$.margin_r + ',' +
      style.$.margin_v + ',' +
      style.$.encoding).join('\n') + '\n';
-}
+}
--- a/src/subtitle/formats/index.ts
+++ b/src/subtitle/formats/index.ts
@@ -1,10 +1,8 @@
 'use strict';
-export = main;
-import ass = require('./ass');
-import srt = require('./srt');
-import typings = require('../../typings');
+import ass from './ass';
+import srt from './srt';

-var main: typings.IFormatterTable = {
+export default <IFormatterTable> {
  ass: ass,
  srt: srt
-};
+};
--- a/src/subtitle/formats/srt.ts
+++ b/src/subtitle/formats/srt.ts
@@ -1,14 +1,12 @@
 'use strict';
-export = srt;
 import xml2js = require('xml2js');
-import typings = require('../../typings');

 /**
 * Converts an input buffer to a SubRip subtitle.
 */
-function srt(input: Buffer|string, done: (err: Error, subtitle?: string) => void) {
+ export default function(input: Buffer|string, done: (err: Error, subtitle?: string) => void) {
  var options = {explicitArray: false, explicitRoot: false};
-  xml2js.parseString(input.toString(), options, (err: Error, xml: typings.ISubtitle) => {
+  xml2js.parseString(input.toString(), options, (err: Error, xml: ISubtitle) => {
    try {
      if (err) return done(err);
      done(null, xml.events.event.map((event, index) => {
@@ -63,4 +61,4 @@ function time(value: string): string {
  var seconds = prefix(all[3], 2);
  var milliseconds = suffix(all[4], 3);
  return hours + ':' + minutes + ':' + seconds + ',' + milliseconds;
-}
+}
--- a/src/subtitle/index.ts
+++ b/src/subtitle/index.ts
@@ -1,3 +1,4 @@
 'use strict';
-export import decode = require('./decode');
-export import formats = require('./formats/index');
+import decode from './decode';
+import formats from './formats/index';
+export default {decode, formats};
--- a/src/typings.ts
+++ b/src/typings.ts
@@ -1,136 +0,0 @@
-export interface IConfig {
-  // Authentication
-  pass?: string;
-  user?: string;
-  // Disables
-  cache?: boolean;
-  merge?: boolean;
-  // Filters
-  episode?: number;
-  volume?: number;
-  // Settings
-  format?: string;
-  output?: string;
-  series?: string;
-  tag?: string;
-}
-
-export interface IConfigLine extends IConfig {
-  args: string[];
-}
-
-export interface IConfigTask {
-  address: string;
-  config: IConfigLine;
-}
-
-export interface IEpisodePage {
-  id: number;
-  episode: number;
-  series: string;
-  volume: number;
-  swf: string;
-}
-
-export interface IEpisodePlayer {
-  subtitle: {
-    id: number;
-    iv: string;
-    data: string;
-  };
-  video: {
-    file: string;
-    host: string;
-  };
-}
-
-export interface IEpisodePlayerConfig {
-  'default:preload': {
-    subtitle: {
-      $: {
-        id: string;
-      };
-      iv: string;
-      data: string;
-    };
-    stream_info: {
-      file: string;
-      host: string;
-    };
-  };
-}
-
-export interface IFormatterTable {
-  [key: string]: (input: string|Buffer, done: (err: Error, subtitle?: string) => void) => void;
-}
-
-export interface ISeries {
-  episodes: ISeriesEpisode[];
-  series: string;
-}
-
-export interface ISeriesEpisode {
-  address: string;
-  episode: number;
-  volume: number;
-}
-
-export interface ISubtitle {
-  $: {
-    title: string;
-    wrap_style: string;
-    play_res_x: string;
-    play_res_y: string;
-    id: string;
-    lang_string: string;
-    created: string;
-  };
-  events: ISubtitleEvent;
-  styles: ISubtitleStyle;
-}
-
-export interface ISubtitleEvent {
-  event: {
-    $: {
-      end: string;
-      start: string;
-      style: string;
-      name: string;
-      margin_l: string;
-      margin_r: string;
-      margin_v: string;
-      effect: string;
-      text: string;
-    };
-  }[];
-}
-
-export interface ISubtitleStyle {
-  style: {
-    $: {
-      name: string;
-      font_name: string;
-      font_size: string;
-      primary_colour: string;
-      secondary_colour: string;
-      outline_colour: string;
-      back_colour: string;
-      bold: string;
-      italic: string;
-      underline: string;
-      strikeout: string;
-      scale_x: string;
-      scale_y: string;
-      spacing: string;
-      angle: string;
-      border_style: string;
-      outline: string;
-      shadow: string;
-      alignment: string;
-      margin_l: string;
-      margin_r: string;
-      margin_v: string;
-      encoding: string;
-    };
-  }[];
-}
--- a/src/video/index.ts
+++ b/src/video/index.ts
@@ -1,3 +1,4 @@
 'use strict';
-export import merge = require('./merge');
-export import stream = require('./stream');
+import merge from './merge';
+import stream from './stream';
+export default {merge, stream};
--- a/src/video/merge.ts
+++ b/src/video/merge.ts
@@ -1,22 +1,28 @@
 'use strict';
-export = main;
 import childProcess = require('child_process');
 import fs = require('fs');
 import path = require('path');
 import os = require('os');
-import subtitle = require('../subtitle/index');
-import typings = require('../typings');
+import subtitle from '../subtitle/index';

 /**
 * Merges the subtitle and video files into a Matroska Multimedia Container.
 */
-function main(config: typings.IConfig, rtmpInputPath: string, filePath: string, done: (err: Error) => void) {
+ export default function(config: IConfig, isSubtitled: boolean, rtmpInputPath: string, filePath: string, streamMode: string, done: (err: Error) => void) {
  var subtitlePath = filePath + '.' + (subtitle.formats[config.format] ? config.format : 'ass');
-  var videoPath = filePath + path.extname(rtmpInputPath);
+  var videoPath = filePath;
+	if (streamMode == "RTMP")
+  {
+	  videoPath += path.extname(rtmpInputPath);
+  }
+  else
+  {
+    videoPath += ".mp4";
+  }
  childProcess.exec(command() + ' ' +
    '-o "' + filePath + '.mkv" ' +
    '"' + videoPath + '" ' +
-    '"' + subtitlePath + '"', {
+    (isSubtitled ? '"' + subtitlePath + '"' : ''), {
      maxBuffer: Infinity
    }, err => {
      if (err) return done(err);
@@ -32,7 +38,7 @@ function main(config: typings.IConfig, rtmpInputPath: string, filePath: string,
 */
 function command(): string {
  if (os.platform() !== 'win32') return 'mkvmerge';
-  return path.join(__dirname, '../../bin/mkvmerge.exe');
+  return '"' + path.join(__dirname, '../../bin/mkvmerge.exe') + '"';
 }

 /**
@@ -55,4 +61,4 @@ function unlinkTimeout(videoPath: string, subtitlePath: string, timeout: number)
      if (err) unlinkTimeout(videoPath, subtitlePath, timeout);
    });
  }, timeout);
-}
+}
--- a/src/video/stream.ts
+++ b/src/video/stream.ts
@@ -1,5 +1,4 @@
 'use strict';
-export = main;
 import childProcess = require('child_process');
 import path = require('path');
 import os = require('os');
@@ -7,20 +6,38 @@ import os = require('os');
 /**
 * Streams the video to disk.
 */
-function main(rtmpUrl: string, rtmpInputPath: string, swfUrl: string, filePath: string, done: (err: Error) => void) {
-  childProcess.exec(command() + ' ' +
-    '-r "' + rtmpUrl + '" ' +
-    '-y "' + rtmpInputPath + '" ' +
-    '-W "' + swfUrl + '" ' +
-    '-o "' + filePath + '"', {
-      maxBuffer: Infinity
-    }, done);
+ export default function(rtmpUrl: string, rtmpInputPath: string, swfUrl: string, filePath: string, fileExt: string, mode: string, done: (err: Error) => void) {
+ 	if (mode == "RTMP")
+ 	{
+     	childProcess.exec(command("rtmpdump") + ' ' +
+        		'-r "' + rtmpUrl + '" ' +
+ 			'-y "' + rtmpInputPath + '" ' +
+ 			'-W "' + swfUrl + '" ' +
+ 			'-o "' + filePath + fileExt + '"', {
+ 				maxBuffer: Infinity
+ 			}, done);
+ 	}
+ 	else if (mode == "HLS")
+ 	{
+ 		console.info("Experimental FFMPEG, MAY FAIL!!!");
+ 		var cmd=command("ffmpeg") + ' ' + 
+ 			'-i "' + rtmpInputPath + '" ' + 
+ 			'-c copy -bsf:a aac_adtstoasc ' + 
+ 			'"' + filePath + '.mp4"';
+ 		childProcess.exec(cmd, {
+ 				maxBuffer: Infinity
+ 			}, done);
+ 	}
+ 	else
+ 	{
+ 		console.error("No such mode: " + mode);
+ 	}
 }

 /**
 * Determines the command for the operating system.
 */
-function command(): string {
-  if (os.platform() !== 'win32') return 'rtmpdump';
-  return path.join(__dirname, '../../bin/rtmpdump.exe');
-}
+function command(exe: string): string {
+  if (os.platform() !== 'win32') return exe;
+  return '"' + path.join(__dirname, '../../bin/' + exe + '.exe') + '"';
+}
--- a/ts.js
+++ b/ts.js
@@ -4,6 +4,15 @@ var fs = require('fs');
 var path = require('path');
 var isTest = process.argv[2] === '--only-test';

+// TODO: This build task should be removed upon release of TypeScript 1.5 with
+// the support for `tsconfig.json`. Invoking `tsc` from `package.json` will then
+// read the configuration and compile accordingly. It seems that `TSLint` will,
+// eventually, support this mechanism too. That prevents the need for any kind
+// of build task and will run entirely based on instructions from `npm`.
+//
+// Reference #1: https://github.com/Microsoft/TypeScript/issues/1667
+// Reference #2: https://github.com/palantir/tslint/issues/281
+
 read(function(err, fileNames) {
  clean(fileNames, function() {
    var hasLintError = false;
@@ -50,11 +59,11 @@ function clean(filePaths, done) {
 function compile(filePaths, done) {
  if (isTest) return done(null);
  var execPath = path.join(__dirname, 'node_modules/.bin/tsc');
-  var options = '--declaration --module CommonJS --noImplicitAny --outDir dist';
+  var options = '--declaration --module CommonJS --noImplicitAny --outDir dist --target ES5';
  childProcess.exec([execPath, options].concat(filePaths).join(' '), function(err, stdout) {
-      if (stdout) return done(new Error(stdout));
-      done(null);
-    });
+    if (stdout) return done(new Error(stdout));
+    done(null);
+  });
 }

 /**
@@ -83,10 +92,5 @@ function lint(filePaths, handler, done) {
 * @param {function(Error, Array.<string>)} done
 */
 function read(done) {
-  var contents = fs.readFileSync('crunchyroll.js.njsproj', 'utf8');
-  var expression = /<TypeScriptCompile\s+Include="([\w\W]+?\.ts)" \/>/g;
-  var matches;
-  var filePaths = [];
-  while ((matches = expression.exec(contents))) filePaths.push(matches[1]);
-  done(null, filePaths);
+  done(null, JSON.parse(fs.readFileSync('tsconfig.json', 'utf8')).files);
 }
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -0,0 +1,52 @@
+{
+    "version": "1.5.1-beta",
+    "compilerOptions": {
+        "declaration": true,
+        "noImplicitAny": true,
+        "removeComments": false,
+        "module": "commonjs",
+        "outDir": "dist",
+        "sourceMap": true,
+        "target": "es5"
+    },
+    "filesGlob": [
+        "src/**/*.ts",
+        "typings/**/*.ts"
+    ],
+    "files": [
+        "src/batch.ts",
+        "src/cli.ts",
+        "src/episode.ts",
+        "src/index.ts",
+        "src/interface/IConfig.d.ts",
+        "src/interface/IConfigLine.d.ts",
+        "src/interface/IConfigTask.d.ts",
+        "src/interface/IEpisodePage.d.ts",
+        "src/interface/IEpisodePlayer.d.ts",
+        "src/interface/IEpisodePlayerConfig.d.ts",
+        "src/interface/IFormatterTable.d.ts",
+        "src/interface/ISeries.d.ts",
+        "src/interface/ISeriesEpisode.d.ts",
+        "src/interface/ISubtitle.d.ts",
+        "src/interface/ISubtitleEvent.d.ts",
+        "src/interface/ISubtitleStyle.d.ts",
+        "src/request.ts",
+        "src/series.ts",
+        "src/subtitle/decode.ts",
+        "src/subtitle/formats/ass.ts",
+        "src/subtitle/formats/index.ts",
+        "src/subtitle/formats/srt.ts",
+        "src/subtitle/index.ts",
+        "src/video/index.ts",
+        "src/video/merge.ts",
+        "src/video/stream.ts",
+        "typings/big-integer/big-integer.d.ts",
+        "typings/cheerio/cheerio.d.ts",
+        "typings/commander/commander.d.ts",
+        "typings/form-data/form-data.d.ts",
+        "typings/mkdirp/mkdirp.d.ts",
+        "typings/node/node.d.ts",
+        "typings/request/request.d.ts",
+        "typings/xml2js/xml2js.d.ts"
+    ]
+}
Author	SHA1	Message	Date
Godzil	2853334d7f	1.1.11 - Update login mechanism to march CR september 2016 changes	2016-09-16 22:20:43 +01:00
Godzil	69dd28d31b	Update login to match latest CR changes	2016-09-16 22:20:39 +01:00
Godzil	56afce02ea	1.1.10 - Change name format to follow Plex forvourite one. - Remplace ":" in file name to prevent issue on Windows	2016-09-10 20:22:10 +01:00
Godzil	bc4697061e	Remplace ':' in filename to make Windows happy	2016-09-10 20:17:19 +01:00
Godzil	55ffe85f77	Make the name to be more Plex friendly	2016-09-10 11:53:45 +01:00
Godzil	ec8c2c7716	1.1.9 New features: - Should correctly handle 10.5 or 1A episode numbers - Change characters in series name that are not allowed in filename (or could cause issues, like slash ( / ) or single quote ( ' ) - Prevent overwrite of existing files (usefull when different season report the same number) - If an error during episode metadata scraping, it will set to Season 0, episode 0 (look at the logs!) - If an episode is not available yet, it will be skipped	2016-09-07 22:09:14 +01:00
Godzil	714a528f8b	Prevent overwriting an existing output file	2016-09-07 21:55:14 +01:00
Godzil	8314d91bd7	Add functionality to ignore (instead of stopping) if an episode is not available yet	2016-09-07 21:51:36 +01:00
Godzil	5bd31f9e0b	Add better episode numbering scheme	2016-09-07 21:34:29 +01:00
Godzil	95a93930f3	Merge branch 'master' of github.com:Godzil/crunchyroll.js	2016-08-22 13:10:02 +02:00
Godzil	4a9e1d0410	Update LICENSE	2016-08-22 12:03:05 +01:00
Godzil	1eacd0a5ca	add license to npm	2016-08-22 13:03:02 +02:00
Godzil	3c32726745	1.1.8	2016-08-22 12:32:25 +02:00
Godzil	42ae0ae1fb	Forget to rename main executable	2016-08-22 12:30:43 +02:00
Godzil	e4b3871919	1.1.7	2016-08-22 12:22:45 +02:00
Godzil	58e4a557e2	Update readme	2016-08-22 12:22:36 +02:00
Godzil	8371d68113	Correct errors	2016-08-22 12:21:17 +02:00
Godzil	b7d496fc9d	Update README.md	2016-08-22 10:51:23 +01:00
Godzil	14260d04b3	Update README.md	2016-08-22 10:50:13 +01:00
Godzil	3d46b65d67	Update package.json	2016-08-22 10:47:18 +01:00
Godzil	62a08e14bb	Add missing mode parameter to the stream object. (and correct call to it)	2016-08-13 21:24:57 +01:00
Godzil	422d0827f9	Correct file source extension for the merge pass.	2016-08-13 16:32:56 +01:00
Godzil	546a849aa5	Add ffmpeg when using HLS instead of RTMP.	2016-08-13 16:20:33 +01:00
Roel van Uden	e06ff53210	Lock down dependencies, bump version (#9 )	2015-06-25 19:42:10 +02:00
Roel van Uden	18375d3d22	Update to TS1.5	2015-05-23 19:07:14 +02:00
Roel van Uden	5fdee94b38	References for future self.	2015-03-07 18:46:42 +01:00
Roel van Uden	7145f72635	Bump the version	2015-03-07 13:31:30 +01:00
Roel van Uden	4f613ad45c	Quick developer updates to develop with atom	2015-03-07 13:31:15 +01:00
Roel van Uden	1afcef88a0	#6 : Support subtitles without multiple styles.	2015-03-07 13:30:02 +01:00
Roel van Uden	1288d0b3f8	Notes for future me	2015-03-07 13:29:36 +01:00
Roel van Uden	2bb5feb647	Generate source maps with tsconfig	2015-03-07 13:29:29 +01:00
Roel van Uden	602f772fcf	Get rid of Visual Studio project files for tsconfig	2015-03-07 11:52:10 +01:00
Roel van Uden	887b3ed094	Bump the version	2015-03-06 22:22:53 +01:00
Roel van Uden	49e3290f28	Fixing the README while I'm at it	2015-03-06 22:17:45 +01:00
Roel van Uden	5d32d91d7d	#5 : Enable merging subtitle-less.	2015-03-06 22:12:03 +01:00
Roel van Uden	2f1858cde7	#5 : Support subtitle-less videos	2015-03-06 21:58:31 +01:00
Roel van Uden	a98ed223c6	#5 : Support drama videos in regex	2015-03-06 21:50:31 +01:00
Roel van Uden	575569bd91	#4 : Support spaces in Windows path	2015-03-06 21:41:02 +01:00