prioritize displaying file types

mihomo-party-org · Nov 26, 2024 · 2b42f68 · 2b42f68
1 parent ceb89d2
commit 2b42f68
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/renderer/src/components/resources/proxy-provider.tsx b/src/renderer/src/components/resources/proxy-provider.tsx
@@ -47,11 +47,16 @@ const ProxyProvider: React.FC = () => {
   const { data, mutate } = useSWR('mihomoProxyProviders', mihomoProxyProviders)
   const providers = useMemo(() => {
     if (!data) return []
-    if (!data.providers) return []
-    return Object.keys(data.providers)
-      .map((key) => data.providers[key])
-      .filter((provider) => {
-        return 'subscriptionInfo' in provider
+    return Object.values(data.providers)
+      .filter(provider => 'subscriptionInfo' in provider)
+      .sort((a, b) => {
+        if (a.vehicleType === 'File' && b.vehicleType !== 'File') {
+          return -1
+        }
+        if (a.vehicleType !== 'File' && b.vehicleType === 'File') {
+          return 1
+        }
+        return 0
       })
   }, [data])
   const [updating, setUpdating] = useState(Array(providers.length).fill(false))

diff --git a/src/renderer/src/components/resources/rule-provider.tsx b/src/renderer/src/components/resources/rule-provider.tsx
@@ -47,8 +47,15 @@ const RuleProvider: React.FC = () => {
   const { data, mutate } = useSWR('mihomoRuleProviders', mihomoRuleProviders)
   const providers = useMemo(() => {
     if (!data) return []
-    if (!data.providers) return []
-    return Object.keys(data.providers).map((key) => data.providers[key])
+    return Object.values(data.providers).sort((a, b) => {
+      if (a.vehicleType === 'File' && b.vehicleType !== 'File') {
+        return -1
+      }
+      if (a.vehicleType !== 'File' && b.vehicleType === 'File') {
+        return 1
+      }
+      return 0
+    })
   }, [data])
   const [updating, setUpdating] = useState(Array(providers.length).fill(false))