Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix linting errors #58

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix linting errors #58

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,17 @@ const colorSchemes = {
trainers: path.resolve(__dirname, 'themes', 'trainers.yml')
};

function getUserOptions(configObj) {
function getUserOptions(configObject) {
return Object.assign({}, {
get pokemon() {
if (Array.isArray(configObj.pokemon)) {
return configObj.pokemon[Math.floor(Math.random() * configObj.pokemon.length)];
if (Array.isArray(configObject.pokemon)) {
return configObject.pokemon[Math.floor(Math.random() * configObject.pokemon.length)];
}
return configObj.pokemon || 'pikachu';

return configObject.pokemon || 'pikachu';
},
get exclude() {
const {exclude} = configObj;
const {exclude} = configObject;

if (!exclude) {
return [];
Expand All @@ -37,10 +38,10 @@ function getUserOptions(configObj) {
return [exclude];
},
get poketab() {
return (configObj.poketab || 'false') === 'true';
return (configObject.poketab || 'false') === 'true';
},
get unibody() {
return (configObj.unibody || 'true') !== 'false';
return (configObject.unibody || 'true') !== 'false';
}
});
}
Expand All @@ -54,6 +55,7 @@ function getRandomTheme(category, exclude) {
return [name, category[name]];
}

const themes = getThemes();
// All themes filtered out thus resolve to default
return ['pikachu', themes.pokemon.pikachu];
}
Expand All @@ -73,25 +75,30 @@ function getThemeColors(theme, exclude) {
if (name === 'random') {
return getRandomTheme(themes.pokemon, excludedThemes);
}

if (Object.prototype.hasOwnProperty.call(themes, name)) {
// Choose a random theme from the given category -- i.e. `fire`
return getRandomTheme(themes[name], excludedThemes);
}

if (Object.prototype.hasOwnProperty.call(themes.pokemon, name)) {
// Return the requested pokemon theme -- i.e. `lapras`
return [name, themes.pokemon[name]];
}
// Got non-existent theme name thus resolve to default

return ['pikachu', themes.pokemon.pikachu];
}

function getMediaPaths(theme) {
const [imagePath, gifPath] = [[], []];

imagePath.push(...[path.join(filepaths.backgrounds, theme), '.png']);
gifPath.push(...[path.join(filepaths.gifs, theme), '.gif']);
if (process.platform === 'win32') {
return [imagePath, gifPath].map(item => item.join('').replace(/\\/g, '/'));
}

return [imagePath.join(''), gifPath.join('')];
}

Expand Down