Merge 127455b018 into d840b06ca7

src/screens/AddonsScreen.tsx

@@ -630,8 +630,8 @@ const AddonsScreen = () => {
       const existingInstallations = installedAddons.filter(a => a.id === manifest.id);
       const isAlreadyInstalled = existingInstallations.length > 0;
 
-      // Check if addon provides streams
-      const providesStreams = manifest.resources?.some(resource => {
+      // Check if addon provides streams or catalogs
+      const providesStreams = (manifest.catalogs && manifest.catalogs.length > 0) || manifest.resources?.some(resource => {
         if (typeof resource === 'string') {
           return resource === 'stream';
         } else if (typeof resource === 'object' && resource !== null && 'name' in resource) {
@@ -643,7 +643,7 @@ const AddonsScreen = () => {
       
       if (isAlreadyInstalled && !providesStreams) {
         setAlertTitle(t('common.error'));
-        setAlertMessage('This addon is already installed. Multiple installations are only allowed for stream providers.');
+        setAlertMessage('This addon is already installed. Multiple installations are only allowed for stream and catalog providers.');
         setAlertActions([{ label: t('common.ok'), onPress: () => setAlertVisible(false) }]);
         setAlertVisible(true);
         return;

src/screens/CatalogSettingsScreen.tsx

@@ -62,6 +62,7 @@ interface GroupedCatalogs {
     catalogs: CatalogSetting[];
     expanded: boolean;
     enabledCount: number;
+    installationNumber?: number;
   };
 }
 
@@ -122,6 +123,16 @@ const createStyles = (colors: any) => StyleSheet.create({
     marginBottom: 8,
     letterSpacing: 0.8,
   },
+  priorityBadge: {
+    paddingHorizontal: 6,
+    paddingVertical: 2,
+    borderRadius: 4,
+  },
+  priorityText: {
+    fontSize: 10,
+    fontWeight: '700',
+    color: '#fff',
+  },
   card: {
     marginHorizontal: 16,
     borderRadius: 12,
@@ -310,7 +321,7 @@ const CatalogSettingsScreen = () => {
           const uniqueCatalogs = new Map<string, CatalogSetting>();
 
           addon.catalogs.forEach(catalog => {
-            const settingKey = `${addon.id}:${catalog.type}:${catalog.id}`;
+            const settingKey = `${addon.installationId || addon.id}:${catalog.type}:${catalog.id}`;
             let displayName = catalog.name || catalog.id;
             const catalogType = catalog.type === 'movie' ? 'Movies' : catalog.type === 'series' ? 'TV Shows' : catalog.type.charAt(0).toUpperCase() + catalog.type.slice(1);
 
@@ -335,7 +346,7 @@ const CatalogSettingsScreen = () => {
             }
 
             uniqueCatalogs.set(settingKey, {
-              addonId: addon.id,
+              addonId: addon.installationId || addon.id,
               catalogId: catalog.id,
               type: catalog.type,
               name: displayName,
@@ -348,18 +359,27 @@ const CatalogSettingsScreen = () => {
         }
       });
 
+      // Count installations per base addon id
+      const installationCountById: Record<string, number> = {};
+      const installationIndexById: Record<string, number> = {};
+      addons.forEach(addon => {
+        installationCountById[addon.id] = (installationCountById[addon.id] || 0) + 1;
+      });
+
       // Group settings by addon name
       const grouped: GroupedCatalogs = {};
       availableCatalogs.forEach(setting => {
-        const addon = addons.find(a => a.id === setting.addonId);
+        const addon = addons.find(a => (a.installationId || a.id) === setting.addonId);
         if (!addon) return;
 
         if (!grouped[setting.addonId]) {
+          installationIndexById[addon.id] = (installationIndexById[addon.id] || 0) + 1;
           grouped[setting.addonId] = {
             name: addon.name,
             catalogs: [],
             expanded: true,
-            enabledCount: 0
+            enabledCount: 0,
+            installationNumber: installationCountById[addon.id] > 1 ? installationIndexById[addon.id] : undefined
           };
         }
 
@@ -620,9 +640,16 @@ const CatalogSettingsScreen = () => {
 
         {Object.entries(groupedSettings).map(([addonId, group]) => (
           <View key={addonId} style={styles.addonSection}>
-            <Text style={styles.addonTitle}>
-              {group.name.toUpperCase()}
-            </Text>
+            <View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 8 }}>
+              <Text style={[styles.addonTitle, { marginBottom: 0 }]}>
+                {group.name.toUpperCase()}
+              </Text>
+              {group.installationNumber !== undefined && (
+                <View style={[styles.priorityBadge, { marginLeft: 8, backgroundColor: colors.primary }]}>
+                  <Text style={styles.priorityText}>#{group.installationNumber}</Text>
+                </View>
+              )}
+            </View>
 
             <View style={styles.card}>
               <TouchableOpacity

src/screens/HomeScreen.tsx

@@ -245,7 +245,7 @@ const HomeScreen = () => {
         if (addon.catalogs) {
           for (const catalog of addon.catalogs) {
             // Check if this catalog is enabled (default to true if no setting exists)
-            const settingKey = `${addon.id}:${catalog.type}:${catalog.id}`;
+            const settingKey = `${addon.installationId || addon.id}:${catalog.type}:${catalog.id}`;
             const isEnabled = catalogSettings[settingKey] ?? true;
 
             // Only load enabled catalogs

src/services/catalogService.ts

@@ -18,6 +18,7 @@ export enum DataSource {
 
 export interface StreamingAddon {
   id: string;
+  installationId?: string;
   name: string;
   version: string;
   description: string;
@@ -313,6 +314,7 @@ class CatalogService {
   private convertManifestToStreamingAddon(manifest: Manifest): StreamingAddon {
     return {
       id: manifest.id,
+      installationId: manifest.installationId,
       name: manifest.name,
       version: manifest.version,
       description: manifest.description,
@@ -339,7 +341,7 @@ class CatalogService {
     for (const addon of addons) {
       if (addon.catalogs) {
         for (const catalog of addon.catalogs) {
-          const settingKey = `${addon.id}:${catalog.type}:${catalog.id}`;
+          const settingKey = `${addon.installationId || addon.id}:${catalog.type}:${catalog.id}`;
           const isEnabled = catalogSettings[settingKey] ?? true;
 
           if (isEnabled) {

src/services/stremioService.ts

@@ -287,6 +287,10 @@ class StremioService {
 
 
   private addonProvidesStreams(manifest: Manifest): boolean {
+    if (manifest.catalogs && Array.isArray(manifest.catalogs) && manifest.catalogs.length > 0) {
+      return true;
+    }
+
     if (!manifest.resources || !Array.isArray(manifest.resources)) {
       return false;
     }
@@ -699,7 +703,7 @@ class StremioService {
 
       // Only allow multiple installations for stream-providing addons
       if (isAlreadyInstalled && !this.addonProvidesStreams(manifest)) {
-        throw new Error('This addon is already installed. Multiple installations are only allowed for stream providers.');
+        throw new Error('This addon is already installed. Multiple installations are only allowed for stream and catalog providers.');
       }
 
       // Generate a unique installation ID for this installation