godzil/crunchy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More lint cleaning, add a way to download a single episode by URL

Browse Source
This commit is contained in:
Godzil 2017-02-10 23:51:22 +00:00
parent 2fea379484
commit cfe73f5ca8
2 changed files with 85 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/batch.ts
View File

@ -28,11 +28,11 @@ export default function(args: string[], done: (err?: Error) => void)
return done();
}
series(tasks[i].config, tasks[i].address, err =>
series(tasks[i].config, tasks[i].address, (errin) =>
{
if (err)
if (errin)
{
return done(err);
return done(errin);
}
i += 1;
next();
@ -48,7 +48,7 @@ function split(value: string): string[]
{
let inQuote = false;
let i: number;
let pieces: string[] = [];
const pieces: string[] = [];
let previous = 0;
for (i = 0; i < value.length; i += 1)
@ -65,7 +65,7 @@ function split(value: string): string[]
}
}
let lastPiece = value.substring(previous, i).match(/^"?(.+?)"?$/);
const lastPiece = value.substring(previous, i).match(/^"?(.+?)"?$/);
if (lastPiece)
{
@ -82,13 +82,15 @@ function tasks(config: IConfigLine, batchPath: string, done: (err: Error, tasks?
{
if (config.args.length)
{
return done(null, config.args.map(address =>
const configIn = config;
return done(null, config.args.map((addressIn) =>
{
return {address: address, config: config};
return {address: addressIn, config: configIn};
}));
}
fs.exists(batchPath, exists =>
fs.exists(batchPath, (exists) =>
{
if (!exists)
{
@ -102,25 +104,25 @@ function tasks(config: IConfigLine, batchPath: string, done: (err: Error, tasks?
return done(err);
}
let map: IConfigTask[] = [];
const map: IConfigTask[] = [];
data.split(/\r?\n/).forEach(line =>
data.split(/\r?\n/).forEach((line) =>
{
if (/^(\/\/|#)/.test(line))
{
return;
}
let lineConfig = parse(process.argv.concat(split(line)));
const lineConfig = parse(process.argv.concat(split(line)));
lineConfig.args.forEach(address =>
lineConfig.args.forEach((addressIn) =>
{
if (!address)
if (!addressIn)
{
return;
}
map.push({address: address, config: lineConfig});
map.push({address: addressIn, config: lineConfig});
});
});
done(null, map);

123
src/series.ts
View File

@ -19,30 +19,34 @@ export default function(config: IConfig, address: string, done: (err: Error) =>
{
const cache = config.cache ? {} : JSON.parse(contents || '{}');
page(config, address, (err, page) =>
page(config, address, (errP, page) =>
{
if (err)
if (errP)
{
return done(err);
return done(errP);
}
let i = 0;
(function next()
{
if (i >= page.episodes.length) return done(null);
download(cache, config, address, page.episodes[i], (err, ignored) =>
download(cache, config, address, page.episodes[i], (errD, ignored) =>
{
if (err)
if (errD)
{
return done(err);
return done(errD);
}
if ((ignored === false) || (ignored === undefined))
{
const newCache = JSON.stringify(cache, null, ' ');
fs.writeFile(persistentPath, newCache, err =>
fs.writeFile(persistentPath, newCache, (errW) =>
{
if (err) return done(err);
if (errW)
{
return done(errW);
}
i += 1;
next();
});
@ -96,15 +100,20 @@ function filter(config: IConfig, item: ISeriesEpisode)
{
// Filter on chapter.
const episodeFilter = config.episode;
if (episodeFilter > 0 && parseInt(item.episode, 10) <= episodeFilter) return false;
if (episodeFilter < 0 && parseInt(item.episode, 10) >= -episodeFilter) return false;
// Filter on volume.
const volumeFilter = config.volume;
if (volumeFilter > 0 && item.volume <= volumeFilter) return false;
if (volumeFilter < 0 && item.volume >= -volumeFilter) return false;
const currentEpisode = parseInt(item.episode, 10);
const currentVolume = item.volume;
if ( ( (episodeFilter > 0) && (currentEpisode <= episodeFilter) ) ||
( (episodeFilter < 0) && (currentEpisode >= -episodeFilter) ) ||
( (volumeFilter > 0) && (currentVolume <= volumeFilter ) ) ||
( (volumeFilter < 0) && (currentVolume >= -volumeFilter ) ) )
{
return false;
}
return true;
}
@ -113,48 +122,54 @@ function filter(config: IConfig, item: ISeriesEpisode)
*/
function page(config: IConfig, address: string, done: (err: Error, result?: ISeries) => void)
{
request.get(config, address, (err, result) =>
if (address[0] === '@')
{
if (err)
{
return done(err);
}
const $ = cheerio.load(result);
const title = $('span[itemprop=name]').text();
if (!title)
{
return done(new Error('Invalid page.(' + address + ')'));
}
log.info('Checking availability for ' + title);
const episodes: ISeriesEpisode[] = [];
$('.episode').each((i, el) =>
{
if ($(el).children('img[src*=coming_soon]').length)
{
return;
}
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 episode = regexp.exec($(el).children('.series-title').text());
const address = $(el).attr('href');
if (!address || !episode)
{
return;
}
episodes.push({
address: address,
episode: episode[1],
volume: volume ? parseInt(volume[0], 10) : 1
});
episodes.push({
address: address.substr(1),
episode: '',
volume: 0,
});
done(null, {episodes: episodes.reverse(), series: ""});
}
else
{
request.get(config, address, (err, result) => {
if (err) {
return done(err);
}
done(null, {episodes: episodes.reverse(), series: title});
});
const $ = cheerio.load(result);
const title = $('span[itemprop=name]').text();
if (!title) {
return done(new Error('Invalid page.(' + address + ')'));
}
log.info('Checking availability for ' + title);
const episodes: ISeriesEpisode[] = [];
$('.episode').each((i, el) => {
if ($(el).children('img[src*=coming_soon]').length) {
return;
}
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 episode = regexp.exec($(el).children('.series-title').text());
const url = $(el).attr('href');
if ((!url) || (!episode)) {
return;
}
episodes.push({
address: url,
episode: episode[1],
volume: volume ? parseInt(volume[0], 10) : 1,
});
});
done(null, {episodes: episodes.reverse(), series: title});
});
}
}