Skip to content
This repository was archived by the owner on Jan 28, 2023. It is now read-only.

Fix some crashes #3

Open
linquize wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix some crashes #3

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c2323f
Fix crashes that handle both 'key: value' and 'key:value'
linquize Mar 17, 2020
8ef4d0b
Fix NotSupportedException at "Supports" key
linquize Mar 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions UserInterface/Port.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,14 @@ public static List<Dictionary<string, string>> ParseParagraph(string filepath)
}
else
{
var lsplit = line.Split(new string[] { ": " }, 2, StringSplitOptions.RemoveEmptyEntries);
paragraph.Add(lsplit[0], lsplit.Length < 2 ? string.Empty : lsplit[1]);
lastkey = lsplit[0];
int colon = line.IndexOf(':');
if (colon > 0)
{
var key = line.Substring(0, colon);
var value = line.Substring(colon + 1);
paragraph.Add(key, value);
lastkey = key;
}
}
}
if(paragraph.Count >0) result.Add(paragraph);
Expand All @@ -69,7 +74,7 @@ public static Port ParseControlFile(string filepath)
case "Description": port.CoreParagraph.Description = item.Value; break;
case "Maintainer": port.CoreParagraph.Maintainer = item.Value; break;
case "Default-Features": port.CoreParagraph.DefaultFeatures = CommaSplit(item.Value); break;
case "Supports": throw new NotSupportedException();
case "Supports": port.CoreParagraph.Supports = CommaSplit(item.Value); break;
}
}
else if (paragraph.Keys.Contains(FeatureToken))
Expand Down Expand Up @@ -131,7 +136,7 @@ public static List<StatusParagraph> ParseStatus(string statusFile)
case "Depends": status.Depends = CommaSplit(item.Value); break;
case "Description": status.Description = item.Value; break;
case "Status":
var strs = item.Value.Split(' ');
var strs = item.Value.Trim().Split(' ');
status.Want = (Want)Enum.Parse(typeof(Want), strs[0], true);
status.State = InstallStateParser[strs[2]];
break;
Expand Down