Merge pull request #481 from NickvisionApps/fix-resolutions

Fix invalid video resolution options
NickvisionApps · Jul 26, 2023 · 25bc87f · 25bc87f
2 parents a3af8bc + 0871d2e
commit 25bc87f
Showing 1 changed file with 15 additions and 21 deletions.
diff --git a/NickvisionTubeConverter.Shared/Models/MediaUrlInfo.cs b/NickvisionTubeConverter.Shared/Models/MediaUrlInfo.cs
@@ -127,36 +127,30 @@ private void ParseFormats(PyDict mediaInfo)
         foreach (var f in mediaInfo["formats"].As<PyList>())
         {
             var format = f.As<PyDict>();
-            if (format.HasKey("vbr"))
+            if (format.HasKey("vcodec"))
             {
-                if (format.HasKey("language") && format["vcodec"].As<string>() == "none")
+                if (format["vcodec"].As<string>() == "none")
                 {
-                    if (!format["language"].IsNone() && !AudioLanguages.Contains(format["language"].As<string>()))
+                    if (format.HasKey("language"))
                     {
-                        AudioLanguages.Add(format["language"].As<string>());
-                    }
-                }
-                try
-                {
-                    var resolution = new VideoResolution(format["width"].As<int>(), format["height"].As<int>());
-                    if (!VideoResolutions.Contains(resolution))
-                    {
-                        VideoResolutions.Add(resolution);
+                        if (!format["language"].IsNone() && !AudioLanguages.Contains(format["language"].As<string>()))
+                        {
+                            AudioLanguages.Add(format["language"].As<string>());
+                        }
                     }
                 }
-                catch { }
-            }
-            else if (format.HasKey("resolution"))
-            {
-                try
+                else if (format.HasKey("resolution"))
                 {
-                    var resolution = VideoResolution.Parse(format["resolution"].As<string>());
-                    if (resolution != null && !VideoResolutions.Contains(resolution))
+                    try
                     {
-                        VideoResolutions.Add(resolution);
+                        var resolution = VideoResolution.Parse(format["resolution"].As<string>());
+                        if (resolution != null && !VideoResolutions.Contains(resolution))
+                        {
+                            VideoResolutions.Add(resolution);
+                        }
                     }
+                    catch { }
                 }
-                catch { }
             }
         }
         VideoResolutions.Sort((a, b) => b.CompareTo(a));