jellyfin/jellyfin-expo
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-expo.git synced 2024-12-14 09:08:32 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #64 from thornbill/eslint

Browse Source 
Update eslint rules
This commit is contained in:
Bill Thornton 2020-04-15 17:12:28 -04:00 committed by GitHub
commit 9892b5b2d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 172 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.eslintrc.json
View File

@ -1,11 +1,15 @@
{
"env": {
"es6": true,
"es2020": true,
"node": true
},
"extends": [
"eslint:recommended",
"plugin:react/recommended"
"plugin:react/recommended",
"plugin:promise/recommended",
"plugin:import/errors",
"plugin:import/warnings",
"plugin:eslint-comments/recommended"
],
"globals": {
"Atomics": "readonly",
@ -16,11 +20,14 @@
"ecmaFeatures": {
"jsx": true
},
"ecmaVersion": 2018,
"ecmaVersion": 2020,
"sourceType": "module"
},
"plugins": [
"react"
"react",
"promise",
"import",
"eslint-comments"
],
"settings": {
"react": {
@ -28,6 +35,22 @@
}
},
"rules": {
"react/prop-types": ["error", { "ignore": ["navigation"] }]
"react/prop-types": ["error", { "ignore": ["navigation"] }],
"block-spacing": ["error"],
"brace-style": ["error"],
"comma-dangle": ["error", "never"],
"comma-spacing": ["error"],
"eol-last": ["error"],
"indent": ["error", 2, { "SwitchCase": 1 }],
"keyword-spacing": ["error"],
"max-statements-per-line": ["error"],
"no-floating-decimal": ["error"],
"no-multi-spaces": ["error"],
"no-multiple-empty-lines": ["error", { "max": 1 }],
"no-trailing-spaces": ["error"],
"one-var": ["error", "never"],
"semi": ["error"],
"space-before-blocks": ["error"]
}
}

8
App.js
View File

@ -48,10 +48,10 @@ export default class App extends React.Component {
} else {
return (
<ThemeProvider theme={Theme}>
<View style={styles.container}>
{Platform.OS === 'ios' && <StatusBar barStyle="light-content" />}
<AppNavigator />
</View>
<View style={styles.container}>
{Platform.OS === 'ios' && <StatusBar barStyle="light-content" />}
<AppNavigator />
</View>
</ThemeProvider>
);
}

2
babel.config.js
View File

@ -6,6 +6,6 @@
module.exports = function(api) {
api.cache(true);
return {
presets: ['babel-preset-expo'],
presets: ['babel-preset-expo']
};
};

6
components/ServerInput.js
View File

@ -44,7 +44,7 @@ export default class ServerInput extends React.Component {
try {
url = JellyfinValidator.parseUrl(host);
console.log('parsed url', url);
} catch(err) {
} catch (err) {
console.info(err);
this.setState({
isValidating: false,
@ -70,7 +70,7 @@ export default class ServerInput extends React.Component {
let servers = await CachingStorage.getInstance().getItem(StorageKeys.Servers) || [];
servers = servers.concat([{ url }]);
await CachingStorage.getInstance().setItem(StorageKeys.Servers, servers);
await CachingStorage.getInstance().setItem(StorageKeys.ActiveServer, servers.length - 1)
await CachingStorage.getInstance().setItem(StorageKeys.ActiveServer, servers.length - 1);
// Call the success callback if present
if (this.props.onSuccess) {
this.props.onSuccess();
@ -81,7 +81,7 @@ export default class ServerInput extends React.Component {
this.setState({
isValid: false,
validationMessage: 'Server Address cannot be empty'
})
});
}
}

2
components/SettingSection.js
View File

@ -39,4 +39,4 @@ const styles = StyleSheet.create({
marginLeft: 15,
marginRight: 15
}
});
});

2
constants/Colors.js
View File

@ -20,5 +20,5 @@ export default {
warningBackground: '#EAEB5E',
warningText: '#666804',
noticeBackground: tintColor,
noticeText: '#fff',
noticeText: '#fff'
};

4
constants/Layout.js
View File

@ -11,7 +11,7 @@ const height = Dimensions.get('window').height;
export default {
window: {
width,
height,
height
},
isSmallDevice: width < 375,
isSmallDevice: width < 375
};

2
constants/Storage.js
View File

@ -8,4 +8,4 @@ const prefix = 'org.jellyfin.expo';
export default {
ActiveServer: `${prefix}:ActiveServer`,
Servers: `${prefix}:Servers`
}
};

2
navigation/AppNavigator.js
View File

@ -15,4 +15,4 @@ export default createAppContainer(createSwitchNavigator({
Main: MainTabNavigator
}, {
initialRouteName: 'ServerLoading'
}));
}));

16
navigation/MainTabNavigator.js
View File

@ -7,7 +7,7 @@ import React from 'react';
import { Platform } from 'react-native';
import { createStackNavigator, createBottomTabNavigator } from 'react-navigation';
import Colors from '../constants/Colors'
import Colors from '../constants/Colors';
import TabBarIcon from '../components/TabBarIcon';
import HomeScreen from '../screens/HomeScreen';
import SettingsScreen from '../screens/SettingsScreen';
@ -17,10 +17,10 @@ const defaultNavigationOptions = {
backgroundColor: Colors.backgroundColor
},
headerTintColor: Colors.headerTintColor
}
};
const HomeStack = createStackNavigator({
Home: HomeScreen,
Home: HomeScreen
}, {
defaultNavigationOptions
});
@ -55,15 +55,15 @@ HomeStack.navigationOptions = ({ navigation }) => {
};
const SettingsStack = createStackNavigator({
Settings: SettingsScreen,
Settings: SettingsScreen
}, {
defaultNavigationOptions
});
SettingsStack.navigationOptions = {
tabBarLabel: 'Settings',
// eslint-disable-next-line react/display-name, react/prop-types
tabBarIcon: ({ focused }) => (
// eslint-disable-next-line react/display-name, react/prop-types
tabBarIcon: ({ focused }) => (
<TabBarIcon
focused={focused}
name={
@ -72,12 +72,12 @@ SettingsStack.navigationOptions = {
: 'md-cog'
}
/>
),
)
};
export default createBottomTabNavigator({
HomeStack,
SettingsStack,
SettingsStack
}, {
tabBarOptions: {
activeTintColor: Colors.tabIconSelected,

3
package.json
View File

@ -35,6 +35,9 @@
"babel-eslint": "^10.0.2",
"babel-preset-expo": "^8.1.0",
"eslint": "^6.1.0",
"eslint-plugin-eslint-comments": "^3.1.2",
"eslint-plugin-import": "^2.20.2",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-react": "^7.14.3",
"expo-cli": "^3.17.17",
"jest-expo": "^37.0.0"

6
screens/AddServerScreen.js
View File

@ -17,7 +17,7 @@ export default class AddServerScreen extends React.Component {
<Image
style={styles.logoImage}
source={require('../assets/images/logowhite.png')}
fadeDuration={0} // we need to adjust Android devices (https://facebook.github.io/react-native/docs/image#fadeduration) fadeDuration prop to `0` as it's default value is `300`
fadeDuration={0} // we need to adjust Android devices (https://facebook.github.io/react-native/docs/image#fadeduration) fadeDuration prop to `0` as it's default value is `300`
/>
</View>
<ServerInput
@ -25,7 +25,7 @@ export default class AddServerScreen extends React.Component {
containerStyle={styles.serverTextContainer}
/>
</View>
)
);
}
}
@ -47,4 +47,4 @@ const styles = StyleSheet.create({
// Aspect ration of the logo
aspectRatio: 3.18253
}
});
});

4
screens/HomeScreen.js
View File

@ -123,7 +123,7 @@ export default class HomeScreen extends React.Component {
default:
console.debug('[HomeScreen.onMessage]', event, data);
}
} catch(ex) {
} catch (ex) {
console.warn('Exception handling message', state.data);
}
}
@ -146,7 +146,7 @@ export default class HomeScreen extends React.Component {
console.debug('locking orientation to landscape');
ScreenOrientation.lockAsync(ScreenOrientation.OrientationLock.LANDSCAPE);
} else {
console.debug('removing orientation lock')
console.debug('removing orientation lock');
// Remove the orientation lock
ScreenOrientation.unlockAsync();
}

6
screens/ServerLoadingScreen.js
View File

@ -42,7 +42,7 @@ export default class ServerLoadingScreen extends React.Component {
if (!this.state.areResourcesReady) {
return null;
}
return (
<View style={styles.container}>
<Image
@ -52,7 +52,7 @@ export default class ServerLoadingScreen extends React.Component {
// wait for image's content to fully load [`Image#onLoadEnd`] (https://facebook.github.io/react-native/docs/image#onloadend)
SplashScreen.hide();
}}
fadeDuration={0} // we need to adjust Android devices (https://facebook.github.io/react-native/docs/image#fadeduration) fadeDuration prop to `0` as it's default value is `300`
fadeDuration={0} // we need to adjust Android devices (https://facebook.github.io/react-native/docs/image#fadeduration) fadeDuration prop to `0` as it's default value is `300`
/>
<ActivityIndicator />
</View>
@ -65,4 +65,4 @@ const styles = StyleSheet.create({
flex: 1,
backgroundColor: Colors.backgroundColor
}
});
});

36
screens/SettingsScreen.js
View File

@ -30,7 +30,7 @@ import { openBrowser } from '../utils/WebBrowser';
export default class SettingsScreen extends React.Component {
static navigationOptions = {
title: 'Settings',
title: 'Settings'
};
state = {
@ -40,24 +40,28 @@ export default class SettingsScreen extends React.Component {
_keyExtractor = (item, index) => `${item.name}-${index}`;
_renderLink = ({ item, index }) => {console.log('renderLink', item); return (
<ListItem
title={item.name}
leftIcon={item.icon}
topDivider={index === 0}
bottomDivider
chevron
onPress={() => {
openBrowser(item.url)
}}
/>
)};
_renderLink = ({ item, index }) => {
console.log('renderLink', item);
return (
<ListItem
title={item.name}
leftIcon={item.icon}
topDivider={index === 0}
bottomDivider
chevron
onPress={() => {
openBrowser(item.url);
}}
/>
);
};
_renderServer = ({ item, index }) => {
const { info, serverUrl, online = false } = item;
console.log('renderServer', info, serverUrl, online);
let title, subtitle;
let title;
let subtitle;
if (info) {
title = info.ServerName;
subtitle = `Version: ${info.Version}\n${serverUrl}`;
@ -117,7 +121,7 @@ export default class SettingsScreen extends React.Component {
let serverUrl;
try {
serverUrl = JellyfinValidator.getServerUrl(server);
} catch(err) {
} catch (err) {
serverUrl = '';
}
// Try to fetch the server's public info
@ -132,7 +136,7 @@ export default class SettingsScreen extends React.Component {
online: true
}
);
} catch(err) {
} catch (err) {
return Object.assign(
{},
server,

2
utils/CachingStorage.js
View File

@ -52,4 +52,4 @@ export default class CachingStorage {
await AsyncStorage.setItem(key, JSON.stringify(item));
this.cache.set(key, item);
}
}
}

10
utils/JellyfinValidator.js
View File

@ -52,7 +52,7 @@ export default class JellyfinValidator {
const responseJson = await request.then(response => {
clearTimeout(timeoutId);
return response.json()
return response.json();
});
console.log('response', responseJson);
@ -61,7 +61,7 @@ export default class JellyfinValidator {
static getServerUrl(server = {}) {
if (!server || !server.url || !server.url.href) {
throw new Error(`Cannot get server url for invalid server ${server}`)
throw new Error(`Cannot get server url for invalid server ${server}`);
}
// Strip the query string or hash if present
@ -84,7 +84,7 @@ export default class JellyfinValidator {
try {
// Does the server have a valid url?
this.getServerUrl(server);
} catch(err) {
} catch (err) {
return {
isValid: false,
message: 'Invalid URL'
@ -108,10 +108,10 @@ export default class JellyfinValidator {
isValid
};
if (!isValid) {
answer.message = 'Not a Jellyfin server'
answer.message = 'Not a Jellyfin server';
}
return answer;
} catch(err) {
} catch (err) {
return {
isValid: false,
message: 'Could not connect to server'

2
utils/Theme.js
View File

@ -60,4 +60,4 @@ export default {
color: Colors.textColor
}
}
};
};

4
utils/WebBrowser.js
View File

@ -15,14 +15,14 @@ export async function openBrowser(url, options) {
try {
await WebBrowser.openBrowserAsync(url, finalOptions);
} catch(err) {
} catch (err) {
// Workaround issue where swiping browser closed does not dismiss it.
// https://github.com/expo/expo/issues/6918
if (err.message === 'Another WebBrowser is already being presented.') {
try {
await WebBrowser.dismissBrowser();
return WebBrowser.openBrowserAsync(url, finalOptions);
} catch(err) {
} catch (err) {
console.warn('Could not dismiss and reopen browser', err);
}
} else {

84
yarn.lock
View File

@ -3399,6 +3399,14 @@ array-unique@^0.3.2:
resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
array.prototype.flat@^1.2.1:
version "1.2.3"
resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.3.tgz#0de82b426b0318dbfdb940089e38b043d37f6c7b"
integrity sha512-gBlRZV0VSmfPIeWfuuy56XZMvbVfbEUnOXUvt3F/eUUUSyzlgLxhEX4YAEpxNAogRGehPSnfXyPtYyKAhkzQhQ==
dependencies:
define-properties "^1.1.3"
es-abstract "^1.17.0-next.1"
arrify@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@ -4760,6 +4768,11 @@ constants-browserify@^1.0.0:
resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
contains-path@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/contains-path/-/contains-path-0.1.0.tgz#fe8cf184ff6670b6baef01a9d4861a5cbec4120a"
integrity sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=
content-disposition@0.5.2:
version "0.5.2"
resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
@ -5180,7 +5193,7 @@ debounce@^1.2.0:
resolved "https://registry.yarnpkg.com/debounce/-/debounce-1.2.0.tgz#44a540abc0ea9943018dc0eaa95cce87f65cd131"
integrity sha512-mYtLl1xfZLi1m4RtQYlZgJUNQjl4ZxVnHzIR8nLLgi4q1YT8o/WM+MK/f8yfcc9s5Ir5zRaPZyZU6xs1Syoocg==
debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0:
debug@2, debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.9:
version "2.6.9"
resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@ -5515,6 +5528,14 @@ dns-txt@^2.0.2:
dependencies:
buffer-indexof "^1.0.0"
doctrine@1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-1.5.0.tgz#379dce730f6166f76cefa4e6707a159b02c5a6fa"
integrity sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=
dependencies:
esutils "^2.0.2"
isarray "^1.0.0"
doctrine@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
@ -5842,6 +5863,53 @@ escodegen@^1.9.1:
optionalDependencies:
source-map "~0.6.1"
eslint-import-resolver-node@^0.3.2:
version "0.3.3"
resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz#dbaa52b6b2816b50bc6711af75422de808e98404"
integrity sha512-b8crLDo0M5RSe5YG8Pu2DYBj71tSB6OvXkfzwbJU2w7y8P4/yo0MyF8jU26IEuEuHF2K5/gcAJE3LhQGqBBbVg==
dependencies:
debug "^2.6.9"
resolve "^1.13.1"
eslint-module-utils@^2.4.1:
version "2.6.0"
resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz#579ebd094f56af7797d19c9866c9c9486629bfa6"
integrity sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==
dependencies:
debug "^2.6.9"
pkg-dir "^2.0.0"
eslint-plugin-eslint-comments@^3.1.2:
version "3.1.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-3.1.2.tgz#4ef6c488dbe06aa1627fea107b3e5d059fc8a395"
integrity sha512-QexaqrNeteFfRTad96W+Vi4Zj1KFbkHHNMMaHZEYcovKav6gdomyGzaxSDSL3GoIyUOo078wRAdYlu1caiauIQ==
dependencies:
escape-string-regexp "^1.0.5"
ignore "^5.0.5"
eslint-plugin-import@^2.20.2:
version "2.20.2"
resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz#91fc3807ce08be4837141272c8b99073906e588d"
integrity sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==
dependencies:
array-includes "^3.0.3"
array.prototype.flat "^1.2.1"
contains-path "^0.1.0"
debug "^2.6.9"
doctrine "1.5.0"
eslint-import-resolver-node "^0.3.2"
eslint-module-utils "^2.4.1"
has "^1.0.3"
minimatch "^3.0.4"
object.values "^1.1.0"
read-pkg-up "^2.0.0"
resolve "^1.12.0"
eslint-plugin-promise@^4.2.1:
version "4.2.1"
resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a"
integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==
eslint-plugin-react@^7.14.3:
version "7.18.3"
resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.3.tgz#8be671b7f6be095098e79d27ac32f9580f599bc8"
@ -7634,6 +7702,11 @@ ignore@^4.0.6:
resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
ignore@^5.0.5:
version "5.1.4"
resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf"
integrity sha512-MzbUSahkTW1u7JpKKjY7LCARd1fU5W2rLdxlM4kdkayuCwZImjkpluF9CM1aLewYJguPDqewLam18Y6AU69A8A==
image-size@^0.6.0:
version "0.6.3"
resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.6.3.tgz#e7e5c65bb534bd7cdcedd6cb5166272a85f75fb2"
@ -11072,6 +11145,13 @@ pixelmatch@^4.0.2:
dependencies:
pngjs "^3.0.0"
pkg-dir@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
dependencies:
find-up "^2.1.0"
pkg-dir@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@ -12488,7 +12568,7 @@ resolve@1.1.7:
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.1.7.tgz#203114d82ad2c5ed9e8e0411b3932875e889e97b"
integrity sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=
resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
resolve@^1.10.0, resolve@^1.12.0, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.3.2, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.8.1:
version "1.15.1"
resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz#27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"
integrity sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==