Merge pull request #26 from aruppi/feature/improving

Deleting fuzzball unused package.
pull/29/head
Jesús María 5 years ago committed by GitHub
commit 2394fff966
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -47,7 +47,6 @@
"compose-middleware": "^5.0.1",
"cors": "^2.8.5",
"express": "^4.17.1",
"fuzzball": "^1.3.1",
"got": "^11.8.1",
"helmet": "^4.3.1",
"rss-to-json": "^1.1.2",

@ -1,5 +1,5 @@
const rss = require('rss-to-json');
const fuzzball = require('fuzzball');
const {
homgot
} = require('../api/apiCall');
@ -74,20 +74,29 @@ const getAllAnimes = async () =>{
};
const getAllDirectory = async (genres) => {
let data;
if (genres === 'sfw') {
data = directoryAnimes.filter(function (item) {
return !item.genres.includes("Ecchi") && !item.genres.includes("ecchi");
return directoryAnimes.filter(function (doc) {
if (!doc.genres.includes('Ecchi') && !doc.genres.includes('ecchi')) {
return {
id: doc.id,
title: doc.title,
mal_id: doc.mal_id,
poster: doc.poster,
type: doc.type,
genres: doc.genres,
state: doc.state,
score: doc.score,
jkanime: false,
description: doc.description
};
}
});
} else {
data = directoryAnimes;
}
return data.map(doc => ({
return directoryAnimes.map(doc => ({
id: doc.id,
title: doc.title,
mal_title: doc.mal_title,
mal_id: doc.mal_id,
poster: doc.poster,
type: doc.type,
genres: doc.genres,
@ -107,7 +116,7 @@ const getAnitakume = async () => {
const body = JSON.parse(JSON.stringify(rss, null, 3)).items
body.map(doc => {
let time = new Date(doc.created)
let time = new Date(doc.created);
const monthNames = ["Enero", "Febrero", "Marzo", "Abril", "Mayo", "Junio", "Julio", "Agosto", "Septiembre", "Octubre", "Noviembre", "Diciembre"];
let day = time.getDate()
@ -220,8 +229,13 @@ const getSpecials = async (data) =>{
const getMoreInfo = async (title) => {
try {
let data = directoryAnimes;
let result = data.filter(anime => fuzzball.ratio(anime.title, title) > 90)[0];
const result = directoryAnimes.filter(x => {
if (x.title === title) {
return x;
} else {
return x.title === `${title} (TV)` ? x : undefined;
}
})[0];
if (!result.jkanime) {
return {
@ -259,8 +273,13 @@ const getMoreInfo = async (title) =>{
const getEpisodes = async (title) => {
try {
let data = directoryAnimes;
const result = data.filter(x => x.title === title)[0];
const result = directoryAnimes.filter(x => {
if (x.title === title) {
return x;
} else {
return x.title === `${title} (TV)` ? x : undefined;
}
})[0];
if (!result.jkanime) {
return await animeflvInfo(result.id).then(episodes => episodes || null);
@ -364,7 +383,7 @@ const getThemesYear = async (year) => {
const getRandomTheme = async () => {
let data = await homgot(`${BASE_THEMEMOE}roulette`, { parse: true });
let themes = await getThemes(data.themes)
let themes = await getThemes(data.themes);
return themes.map(doc => ({
name: data.name,
@ -459,11 +478,8 @@ const getPlatforms = async (id) => {
twitter: doc.twitter,
instagram: doc.instagram,
webInfo: doc.webInfo,
webpage: doc.webpage,
latitude: doc.latitude || null,
longitude: doc.longitude || null
webpage: doc.webpage
}));
} else {
data = await homgot(`${BASE_ARUPPI}res/documents/animelegal/type/${id}.json`, { parse: true });
@ -505,10 +521,8 @@ const getProfilePlatform = async (id) => {
};
async function getRandomAnime() {
let data = directoryAnimes;
const randomNumber = Math.floor(Math.random() * data.length);
let result = data[randomNumber];
const randomNumber = Math.floor(Math.random() * directoryAnimes.length);
let result = directoryAnimes[randomNumber];
if (!result.jkanime) {
return {

@ -60,8 +60,8 @@ router.get('/allAnimes' , (req, res) =>{
});
router.get('/allDirectory/:genres?' , (req, res) =>{
let genres = req.params.genres;
api.getAllDirectory(genres)
.then(directory =>{
if (directory.length > 0) {

@ -57172,6 +57172,7 @@
"Shounen"
],
"state": "En emision",
"score": "4.4",
"jkanime": false,
"description": "Un fatídico día, toda la humanidad quedó petrificada por un destello de luz cegadora. Después de varios milenios, el estudiante de instituto Taiju se despierta y se encuentra perdido en un mundo de estatuas. Sin embargo, no está solo; su amigo, amante de la ciencia, ha estado trabajando durante unos meses y tiene un gran plan en mente: ¡poner en marcha la civilización con el poder de la ciencia!"
}

@ -140,10 +140,8 @@ const jkanimeInfo = async (id) => {
};
function getPosterAndType(id, mal_id) {
let data = directoryAnimes;
if (id) {
for (let anime of data) {
for (let anime of directoryAnimes) {
if (anime.id === id) {
return [
anime.poster,
@ -154,7 +152,7 @@ function getPosterAndType(id, mal_id) {
}
if (mal_id) {
for (let anime of data) {
for (let anime of directoryAnimes) {
if (anime.mal_id === parseInt(mal_id)) {
return [
anime.poster,
@ -401,9 +399,8 @@ const imageUrlToBase64 = async (url) => {
};
const searchAnime = async (query) => {
let data = directoryAnimes;
let queryLowerCase = query.toLowerCase();
const res = data.filter(x => x.title.toLowerCase().includes(queryLowerCase));
const res = directoryAnimes.filter(x => x.title.toLowerCase().includes(queryLowerCase));
return res.map(doc => ({
id: doc.id || null,

@ -62,7 +62,7 @@ const top = async (type, subtype, page) =>{
const getAllAnimes = async () =>{
let data = await getAnimes()
let data = await getAnimes();
return data.map(item => ({
index: item[0],
@ -78,7 +78,7 @@ const getAllDirectory = async (genres) =>{ return await getDirectory(genres); };
const getAnitakume = async () =>{
const promises = []
const promises = [];
await rss.load(BASE_IVOOX).then(rss => {
@ -121,7 +121,7 @@ const getNews = async (pageRss) =>{
await rss.load(pageRss[i].url).then(rss => {
const body = JSON.parse(JSON.stringify(rss, null, 3)).items
const body = JSON.parse(JSON.stringify(rss, null, 3)).items;
body.map(doc => {
promises.push({
@ -247,9 +247,13 @@ const getMoreInfo = async (title) =>{
try {
const promises = [];
let data = directoryAnimes;
const res = data.filter(x => x.title === title)[0];
const res = directoryAnimes.filter(x => {
if (x.title === title) {
return x;
} else {
return x.title === `${title} (TV)` ? x : undefined;
}
})[0];
if (!res.jkanime) {
promises.push({
@ -307,7 +311,7 @@ const getImages = async (query) => {
let options = { parse: true }
const data = await homgot(`${BASE_QWANT}count=${query.count}&q=${query.title}&t=${query.type}&safesearch=${query.safesearch}&locale=${query.country}&uiv=4`, options);
const body = data.data.result.items;
const promises = []
const promises = [];
body.map(doc =>{
@ -328,7 +332,7 @@ const getYoutubeVideos = async (channelId) => {
let options = { parse: true }
const data = await homgot(`${BASE_YOUTUBE}${channelId.id}&part=${channelId.part}&order=${channelId.order}&maxResults=${channelId.maxResults}`, options);
const body = data[channelId.prop];
const promises = []
const promises = [];
body.map(doc =>{
@ -351,12 +355,12 @@ const getRadioStations = async () => {
}
const getOpAndEd = async (title) => {
let data = await parserThemes.serie(title)
return await structureThemes(data, true)
let data = await parserThemes.serie(title);
return await structureThemes(data, true);
};
const getThemesYear = async (year) => {
let data = []
let data = [];
if (year === undefined) {
return await parserThemes.allYears();
@ -369,7 +373,7 @@ const getThemesYear = async (year) => {
const getRandomTheme = async () => {
let promise = []
let promise = [];
let options = { parse: true }
const data = await homgot(`${BASE_THEMEMOE}roulette`, options);
let themes = await getThemes(data.themes)
@ -378,14 +382,14 @@ const getRandomTheme = async () => {
name: data.name,
title: themes[0].name,
link: themes[0].video
})
});
return promise;
};
const getArtist = async (id) => {
let data
let data;
if (id === undefined) {
return await parserThemes.artists();

@ -307,7 +307,7 @@ const searchAnime = async (query) => {
const obtainAnimeSeries = async ($) => {
let promises = []
let promises = [];
await asyncForEach($('div.Container ul.ListAnimes li article'), async (element) => {
@ -472,20 +472,29 @@ const getThemes = async (themes) => {
const getAnimes = async () => await homgot(`${BASE_ANIMEFLV}api/animes/list`, { parse: true });
const getDirectory = async (genres) => {
let data
if (genres === "sfw") {
data = directoryAnimes.filter(function (item) {
return !item.genres.includes("Ecchi") && !item.genres.includes("ecchi");
})
} else {
data = directoryAnimes;
if (genres === 'sfw') {
return directoryAnimes.filter(function (doc) {
if (!doc.genres.includes('Ecchi') && !doc.genres.includes('ecchi')) {
return {
id: doc.id,
title: doc.title,
mal_id: doc.mal_id,
poster: doc.poster,
type: doc.type,
genres: doc.genres,
state: doc.state,
score: doc.score,
jkanime: false,
description: doc.description
};
}
});
}
return data.map(doc => ({
return directoryAnimes.map(doc => ({
id: doc.id,
title: doc.title,
mal_title: doc.mal_title,
mal_id: doc.mal_id,
poster: doc.poster,
type: doc.type,
genres: doc.genres,
@ -494,7 +503,6 @@ const getDirectory = async (genres) => {
jkanime: false,
description: doc.description
}));
};
module.exports = {

Loading…
Cancel
Save