rework list and allow for options from tabs settings

Signed-off-by: Niv Sardi <xaiki@evilgiggle.com>
midianinja · Jun 12, 2018 · 01567d6 · 01567d6
1 parent f8241bf
commit 01567d6
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 51 deletions.
diff --git a/src/containers/list.js b/src/containers/list.js
@@ -46,61 +46,62 @@ const processTabState = (providers, collections, filters, cache, providerActions
             }])
         }
     }, {items: [], failed: [], providers: []})
-
 }
 
 const memoizedProcessTabState = memoize (processTabState)
 
-const ListContainer = connect(
-    ({markers, collections, filters, cache, providerActions}, {tab}) => {
-        console.error('list', tab, filters)
-        let url = `/list/${tab.id}`
-
-        /**
-         * XXX: we pass the long argument list for memoization to work
-         * I know it's tempting to just pass state, but don't
-         */
-        try {
-            const tabState = memoizedProcessTabState(
-                tab.providers, collections, filters, cache, providerActions
-            )
+const mapStateToProps =  ({markers, collections, filters, cache, providerActions}, {tab}) => {
+    console.error('list', tab, filters)
+    let url = `/list/${tab.id}`
+
+    /**
+     * XXX: we pass the long argument list for memoization to work
+     * I know it's tempting to just pass state, but don't
+     */
+    try {
+        const tabState = memoizedProcessTabState(
+            tab.providers, collections, filters, cache, providerActions
+        )
 
-            return {
-                ...tabState,
-                markers,
-                collections
-            }
-        } catch (e) {
-            console.error('error in list', e)
-            return {
-                markers,
-                collections,
-                items: []
-            }
+        return {
+            ...tabState,
+            markers,
+            collections
         }
-    },
-    (dispatch, {match, history}) => ({
-        dispatch,
-        actions: {
-            ...bindMarkersActions(dispatch),
-            show: (item) => history.push(`${match.url}/${itemURL(item)}`),
-            play: (item) => history.push(`${match.url}/${itemURL(item)}/play`)
+    } catch (e) {
+        console.error('error in list', e)
+        return {
+            markers,
+            collections,
+            items: []
         }
-    }),
-    ({providers, collections, ...stateProps}, {dispatch, ...dispatchProps}, ownProps) => ({
-        ...stateProps,
-        ...dispatchProps,
-        ...ownProps,
-        onStarve: (e) => providers.map(
-            provider => provider.isFetching || do {
-                const {ids} = collections[provider.name]
-                const page = Object.keys(ids).sort().pop() || 0
-                dispatch(
-                    provider.actions.FETCH({page: Number(page) + 1})
-                )
-            }
-        )
-    })
-)(List)
+    }
+}
+
+const mapDispatchToProps = (dispatch, {match, history}) => ({
+    dispatch,
+    actions: {
+        ...bindMarkersActions(dispatch),
+        show: (item) => history.push(`${match.url}/${itemURL(item)}`),
+        play: (item) => history.push(`${match.url}/${itemURL(item)}/play`)
+    }
+})
+
+const mergeProps = ({providers, collections, ...stateProps}, {dispatch, ...dispatchProps}, {tab}) => ({
+    ...stateProps,
+    ...dispatchProps,
+    ...tab.options,
+    onStarve: (e) => providers.map(
+        provider => provider.isFetching || do {
+            const {ids} = collections[provider.name]
+            const page = Object.keys(ids).sort().pop() || 0
+            dispatch(
+                provider.actions.FETCH({page: Number(page) + 1})
+            )
+        }
+    )
+})
+
+const ListContainer = connect(mapStateToProps, mapDispatchToProps, mergeProps)(List)
 
 export {ListContainer as default}
diff --git a/src/containers/listview.js b/src/containers/listview.js
@@ -10,8 +10,8 @@ const mapStateToProps = ({tabs}, {match}) => {
     let tab = tabs[tabId]
     tab.id = tabId
 
-    const menu = Object.entries(tabs).map(([key, value]) => ({
-        title: value.name,
+    const menu = Object.entries(tabs).map(([key, {name}]) => ({
+        title: name,
         path: `/list/${key}`
     }))
 

diff --git a/src/settings.js b/src/settings.js
@@ -9,6 +9,7 @@ Settings.tabs = {
   tvshow: {
     order: 2,
     name: 'Series',
+    options: {itemShowPlay: false},
     providers: ['youtube?channel=midianinjafly&mode=shows']
   },
   telesur: {