Branch for improving and refactoring

pull/10/head
capitanwesler 5 years ago
parent 04cdccc8f6
commit 3c505cf54e

@ -20,7 +20,7 @@ const {
} = require('../utils/index');
const ThemeParser = require('../utils/animetheme');
const parserThemes = new ThemeParser()
const parserThemes = new ThemeParser();
const {
BASE_ANIMEFLV_JELU, BASE_JIKAN, BASE_IVOOX, BASE_QWANT, BASE_YOUTUBE, BASE_THEMEMOE, BASE_ANIMEFLV, BASE_ARUPPI
@ -77,15 +77,17 @@ const getAllAnimes = async () =>{
const getAllDirectory = async (genres) => {
let data
if (genres === "sfw") {
let data;
if (genres === 'sfw') {
data = JSON.parse(JSON.stringify(require('../assets/directory.json'))).filter(function (item) {
return !item.genres.includes("Ecchi") && !item.genres.includes("ecchi");
})
});
} else {
data = JSON.parse(JSON.stringify(require('../assets/directory.json')));
}
return data.map(doc => ({
id: doc.id,
title: doc.title,
@ -363,7 +365,7 @@ const getOpAndEd = async (title) => await structureThemes(await parserThemes.ser
const getThemesYear = async (year) => {
let data = []
let data = [];
if (year === undefined) {
return await parserThemes.allYears();
} else {

@ -1,27 +1,30 @@
const got = require('got');
const got = require('got'); // This is to make a HTTP request without doing AJAX
const cheerio = require('cheerio');
const { CookieJar} = require('tough-cookie');
const cookieJar = new CookieJar();
let response
let data
let response;
let data;
const homgot = async (url, options) => {
if (options !== undefined) {
if (options.scrapy) {
response = await got(url, { cookieJar })
data = await cheerio.load(response.body)
response = await got(url, { cookieJar });
data = await cheerio.load(response.body);
}
if (options.parse) {
data = await got(url, { cookieJar }).json()
data = await got(url, { cookieJar }).json();
}
} else {
data = await got.get(url, { cookieJar });
}
return data
return data;
}
module.exports = {homgot}
module.exports = { homgot };

@ -272,9 +272,9 @@ router.get('/moreInfo/:title' , (req, res) =>{
.then(info => {
if (info !== undefined) {
res.status(200).json(info);
} else (
res.status(500).json({ message: 'Aruppi lost in the shell'})
)
} else {
res.status(500).json({ message: 'Aruppi lost in the shell'});
}
}).catch((err) =>{
console.error(err);
});
@ -287,12 +287,14 @@ router.get('/getEpisodes/:title' , (req, res) =>{
api.getEpisodes(title)
.then(episodes => {
if (episodes.length > 0) {
res.status(200).json({episodes});
} else (
res.status(500).json({ message: 'Aruppi lost in the shell'})
)
} else {
res.status(500).json({ message: 'Aruppi lost in the shell'});
}
}).catch((err) =>{
console.error(err);
});
@ -432,15 +434,16 @@ router.get('/themes/:title' , (req, res) =>{
let title = req.params.title;
api.getOpAndEd(title)
.then(themes => {
if (themes.length > 0) {
if (themes) {
res.status(200).json({
themes
});
} else (
res.status(500).json({ message: 'Aruppi lost in the shell'})
)
} else {
res.status(500).json({ message: 'Aruppi lost in the shell'});
}
}).catch((err) =>{
console.error(err);
});

@ -19,7 +19,7 @@ class ThemeParser {
return await this.parseLinks();
}
catch(err) {
throw err;
console.log(err);
}
}
@ -30,18 +30,18 @@ class ThemeParser {
return await this.parseYears();
}
catch(err) {
throw err;
console.log(err);
}
}
async serie(query) {
async serie(title) {
try {
this.animes = [];
this.$ = await redditocall('anime_index');
return await this.parseSerie(query);
return await this.parseSerie(title);
}
catch(err) {
throw err;
console.log(err);
}
}
@ -52,7 +52,7 @@ class ThemeParser {
return await this.parseArtists();
}
catch(err) {
throw err;
console.log(err);
}
}
@ -63,7 +63,7 @@ class ThemeParser {
return await this.parseArtist();
}
catch(err) {
throw err;
console.log(err);
}
}
@ -74,13 +74,14 @@ class ThemeParser {
return await this.parseRandom(query);
}
catch(err) {
throw err;
console.log(err);
}
}
async year(date) {
let animes = [];
this.$ = await redditocall(date)
this.$ = await redditocall(date);
this.$('h3').each((i, el) => {
let parsed = this.parseAnime(el);
parsed.year = date;
@ -102,13 +103,13 @@ class ThemeParser {
let parsed = this.parseAnime(this.$('h3')[rand]);
resolve(parsed);
})
});
}
parseYears() {
return new Promise(async resolve => {
let promises = []
let promises = [];
let data = this.$('h3 a');
for (let i = 0; i < data.length; i++) {
@ -119,12 +120,12 @@ class ThemeParser {
})
if (i === data.length - 1) {
resolve(promises)
resolve(promises);
}
}
})
});
}
parseArtists() {
@ -169,22 +170,31 @@ class ThemeParser {
})
}
parseSerie(query){
/* - ParseSerie
Parse the HTML from the redditocall
and search for the h3 tag to be the
same of the title and resolve a object.
*/
parseSerie(title) {
return new Promise(async resolve => {
let data = this.$('p a');
for (let i = 0; i < data.length; i++) {
let serieElement = data[i].children[0].data
let serieElement = data[i].children[0].data;
if (serieElement.split(" (")[0] === query) {
if (serieElement.split(" (")[0] === title) {
let year = this.$('p a')[i].attribs.href.split('/r/AnimeThemes/wiki/')[1].split('#wiki')[0];
this.$ = await redditocall(this.$('p a')[i].attribs.href.split('/r/AnimeThemes/wiki/')[1].split('#wiki')[0]);
for (let i = 0; i < this.$('h3').length; i++) {
if (this.$('h3')[i].children[0].children[0].data === query) {
if (this.$('h3')[i].children[0].children[0].data === title) {
let parsed = this.parseAnime(this.$('h3')[i]);
parsed.year = year;
resolve(parsed);
}
}
@ -192,7 +202,7 @@ class ThemeParser {
}
}
})
});
}
parseLinks() {
@ -215,65 +225,80 @@ class ThemeParser {
})
}
parseAnime(dat) {
let el = this.$(dat).children('a');
parseAnime(element) {
let el = this.$(element).children('a');
let title = el.text();
let malId = el.attr('href').split('/')[4];
let next = this.$(dat).next();
let mal_id = el.attr('href').split('/')[4];
let next = this.$(element).next();
let theme = {
id: malId,
id: mal_id,
title
}
};
if (next.prop("tagName") === "TABLE") {
if (next.prop("tagName") === "P") {
theme.themes = this.parseTable(next.next());
} else if (next.prop("tagName") === "TABLE") {
theme.themes = this.parseTable(next);
}else if (next.prop("tagName") === "P") {
theme.themes = this.parseTable(next.next());
}
return theme;
}
parseTable(table) {
if (table.prop('tagName') !== "TABLE") {
return this.parseTable(table.next());
/* - ParseTable
Parse the table tag from the HTML
and returns a object with all the
information.
*/
parseTable(element) {
if (element.prop('tagName') !== "TABLE") {
return this.parseTable(element.next());
}
let themes = [];
table.children('tbody').children('tr').each(function () {
const $ = cheerio.load(this);
const td = $('td'); // Theme row
let name = replaceAll(td.first().text(), "&quot;", "\"")
let linkEl = td.eq(1).children().first();
let link = linkEl.attr('href');
let linkDesc = linkEl.text();
let episodes = td.eq(2).text();
let notes = td.eq(3).text();
element.find('tbody').find('tr').each((i, elem) => {
let name = replaceAll(elem.children[1].children[0].data, "&quot;", "\"");
let link = elem.children[3].children[0].attribs.href;
let linkDesc = elem.children[3].children[0].children[0].data;
let episodes = elem.children[5].children.length > 0 ? elem.children[5].children[0].data : "";
let notes = elem.children[7].children.length > 0 ? elem.children[7].children[0].data : "";
themes.push({
name,
link,
desc: linkDesc,
type: (name.startsWith('OP') ? 'opening' : 'ending'),
type: name.startsWith('OP') ? 'Opening' : name.startsWith('ED') ? 'Ending' : 'OP/ED',
episodes,
notes
})
})
});
});
return themes;
}
}
async function redditocall(href) {
let resp = await homgot(REDDIT_ANIMETHEMES + href + ".json", { parse: true })
let resp = await homgot(REDDIT_ANIMETHEMES + href + ".json", { parse: true });
return cheerio.load(getHTML(resp.data.content_html));
}
function getHTML(str) {
let html = replaceAll(str, "&lt;", "<")
html = replaceAll(html, "&gt;", ">")
let html = replaceAll(str, "&lt;", "<");
html = replaceAll(html, "&gt;", ">");
return html;
}
@ -281,4 +306,5 @@ function replaceAll(str, find, replace) {
return str.replace(new RegExp(find, 'g'), replace);
}
module.exports = ThemeParser;

Loading…
Cancel
Save