Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-04-28 11:53:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove hardcoded catalog type

Browse source
This commit is contained in:
chrisk325 2026-03-14 01:00:23 +05:30 committed by GitHub
parent fce6c49303
commit 359655cc32
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 46 additions and 93 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
src/components/search/AddonSection.tsx
View file

@ -14,6 +14,24 @@ interface AddonSectionProps {
currentTheme: any; currentTheme: any;
} }
const TYPE_LABELS: Record<string, string> = {
'movie': 'search.movies',
'series': 'search.tv_shows',
'anime.movie': 'search.anime_movies',
'anime.series': 'search.anime_series',
};
const subtitleStyle = (currentTheme: any) => ({
color: currentTheme.colors.lightGray,
fontSize: isTV ? 18 : isLargeTablet ? 17 : isTablet ? 16 : 14,
marginBottom: isTV ? 14 : isLargeTablet ? 13 : isTablet ? 12 : 8,
paddingHorizontal: isTV ? 24 : isLargeTablet ? 20 : isTablet ? 16 : 16,
});
const containerStyle = {
marginBottom: isTV ? 40 : isLargeTablet ? 36 : isTablet ? 32 : 24,
};
export const AddonSection = React.memo(({ export const AddonSection = React.memo(({
addonGroup, addonGroup,
addonIndex, addonIndex,
@ -23,18 +41,27 @@ export const AddonSection = React.memo(({
}: AddonSectionProps) => { }: AddonSectionProps) => {
const { t } = useTranslation(); const { t } = useTranslation();
const movieResults = useMemo(() => // Group results by their exact type, preserving order of first appearance
addonGroup.results.filter(item => item.type === 'movie'), const groupedByType = useMemo(() => {
[addonGroup.results] const order: string[] = [];
); const groups: Record<string, StreamingContent[]> = {};
const seriesResults = useMemo(() =>
addonGroup.results.filter(item => item.type === 'series'), for (const item of addonGroup.results) {
[addonGroup.results] if (!groups[item.type]) {
); order.push(item.type);
const otherResults = useMemo(() => groups[item.type] = [];
addonGroup.results.filter(item => item.type !== 'movie' && item.type !== 'series'), }
[addonGroup.results] groups[item.type].push(item);
); }
return order.map(type => ({ type, items: groups[type] }));
}, [addonGroup.results]);
const getLabelForType = (type: string): string => {
if (TYPE_LABELS[type]) return t(TYPE_LABELS[type]);
// Fallback: capitalise and replace dots/underscores for unknown types
return type.replace(/[._]/g, ' ').replace(/\b\w/g, c => c.toUpperCase());
};
return ( return (
<View> <View>
@ -50,22 +77,13 @@ export const AddonSection = React.memo(({
</View> </View>
</View> </View>
{/* Movies */} {groupedByType.map(({ type, items }) => (
{movieResults.length > 0 && ( <View key={type} style={[styles.carouselContainer, containerStyle]}>
<View style={[styles.carouselContainer, { marginBottom: isTV ? 40 : isLargeTablet ? 36 : isTablet ? 32 : 24 }]}> <Text style={[styles.carouselSubtitle, subtitleStyle(currentTheme)]}>
<Text style={[ {getLabelForType(type)} ({items.length})
styles.carouselSubtitle,
{
color: currentTheme.colors.lightGray,
fontSize: isTV ? 18 : isLargeTablet ? 17 : isTablet ? 16 : 14,
marginBottom: isTV ? 14 : isLargeTablet ? 13 : isTablet ? 12 : 8,
paddingHorizontal: isTV ? 24 : isLargeTablet ? 20 : isTablet ? 16 : 16
}
]}>
{t('search.movies')} ({movieResults.length})
</Text> </Text>
<FlatList <FlatList
data={movieResults} data={items}
renderItem={({ item, index }) => ( renderItem={({ item, index }) => (
<SearchResultItem <SearchResultItem
item={item} item={item}
@ -74,81 +92,16 @@ export const AddonSection = React.memo(({
onLongPress={onItemLongPress} onLongPress={onItemLongPress}
/> />
)} )}
keyExtractor={item => `${addonGroup.addonId}-movie-${item.id}`} keyExtractor={item => `${addonGroup.addonId}-${type}-${item.id}`}
horizontal horizontal
showsHorizontalScrollIndicator={false} showsHorizontalScrollIndicator={false}
contentContainerStyle={styles.horizontalListContent} contentContainerStyle={styles.horizontalListContent}
/> />
</View> </View>
)} ))}
{/* TV Shows */}
{seriesResults.length > 0 && (
<View style={[styles.carouselContainer, { marginBottom: isTV ? 40 : isLargeTablet ? 36 : isTablet ? 32 : 24 }]}>
<Text style={[
styles.carouselSubtitle,
{
color: currentTheme.colors.lightGray,
fontSize: isTV ? 18 : isLargeTablet ? 17 : isTablet ? 16 : 14,
marginBottom: isTV ? 14 : isLargeTablet ? 13 : isTablet ? 12 : 8,
paddingHorizontal: isTV ? 24 : isLargeTablet ? 20 : isTablet ? 16 : 16
}
]}>
{t('search.tv_shows')} ({seriesResults.length})
</Text>
<FlatList
data={seriesResults}
renderItem={({ item, index }) => (
<SearchResultItem
item={item}
index={index}
onPress={onItemPress}
onLongPress={onItemLongPress}
/>
)}
keyExtractor={item => `${addonGroup.addonId}-series-${item.id}`}
horizontal
showsHorizontalScrollIndicator={false}
contentContainerStyle={styles.horizontalListContent}
/>
</View>
)}
{/* Other types */}
{otherResults.length > 0 && (
<View style={[styles.carouselContainer, { marginBottom: isTV ? 40 : isLargeTablet ? 36 : isTablet ? 32 : 24 }]}>
<Text style={[
styles.carouselSubtitle,
{
color: currentTheme.colors.lightGray,
fontSize: isTV ? 18 : isLargeTablet ? 17 : isTablet ? 16 : 14,
marginBottom: isTV ? 14 : isLargeTablet ? 13 : isTablet ? 12 : 8,
paddingHorizontal: isTV ? 24 : isLargeTablet ? 20 : isTablet ? 16 : 16
}
]}>
{otherResults[0].type.charAt(0).toUpperCase() + otherResults[0].type.slice(1)} ({otherResults.length})
</Text>
<FlatList
data={otherResults}
renderItem={({ item, index }) => (
<SearchResultItem
item={item}
index={index}
onPress={onItemPress}
onLongPress={onItemLongPress}
/>
)}
keyExtractor={item => `${addonGroup.addonId}-${item.type}-${item.id}`}
horizontal
showsHorizontalScrollIndicator={false}
contentContainerStyle={styles.horizontalListContent}
/>
</View>
)}
</View> </View>
); );
}, (prev, next) => { }, (prev, next) => {
// Only re-render if this section's reference changed
return prev.addonGroup === next.addonGroup && prev.addonIndex === next.addonIndex; return prev.addonGroup === next.addonGroup && prev.addonIndex === next.addonIndex;
}); });