From 59450561cc5e0c9834177c21f203689b9730ebfb Mon Sep 17 00:00:00 2001 From: user Date: Mon, 14 Aug 2023 12:06:44 +0200 Subject: [PATCH 1/5] Update .gitignore --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 09ac4923..0c111eea 100644 --- a/.gitignore +++ b/.gitignore @@ -483,7 +483,7 @@ $RECYCLE.BIN/ .idea/* -data + dati RankingsDati rankingsdati From d5f17c5017f0f95355fa5e1e9b4f9047a47de5ee Mon Sep 17 00:00:00 2001 From: user Date: Mon, 14 Aug 2023 12:12:21 +0200 Subject: [PATCH 2/5] Update RankingUrl.cs --- .../Objects/RankingNS/RankingUrl.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs b/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs index ebafa918..fbbac57c 100644 --- a/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs +++ b/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs @@ -10,7 +10,7 @@ namespace PoliNetwork.Graduatorie.Common.Objects.RankingNS; [Serializable] [JsonObject(MemberSerialization.Fields, NamingStrategyType = typeof(CamelCaseNamingStrategy))] -public class RankingUrl +public class RankingUrl :IComparable { public PageEnum PageEnum = PageEnum.Unknown; public string Url = ""; @@ -187,4 +187,12 @@ public static bool AreSimilar(RankingUrl urlA, RankingUrl urlB) return true; } + + public int CompareTo(RankingUrl? other) + { + if (ReferenceEquals(this, other)) return 0; + if (ReferenceEquals(null, other)) return 1; + var pageEnumComparison = PageEnum.CompareTo(other.PageEnum); + return pageEnumComparison != 0 ? pageEnumComparison : string.Compare(Url, other.Url, StringComparison.Ordinal); + } } \ No newline at end of file From d9b4a9ae82b845206feb6bef833a0d90dc77d3a3 Mon Sep 17 00:00:00 2001 From: user Date: Mon, 14 Aug 2023 12:13:01 +0200 Subject: [PATCH 3/5] Update RankingUrl.cs --- .../Objects/RankingNS/RankingUrl.cs | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs b/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs index fbbac57c..2004c16c 100644 --- a/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs +++ b/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs @@ -10,11 +10,19 @@ namespace PoliNetwork.Graduatorie.Common.Objects.RankingNS; [Serializable] [JsonObject(MemberSerialization.Fields, NamingStrategyType = typeof(CamelCaseNamingStrategy))] -public class RankingUrl :IComparable +public class RankingUrl : IComparable { public PageEnum PageEnum = PageEnum.Unknown; public string Url = ""; + public int CompareTo(RankingUrl? other) + { + if (ReferenceEquals(this, other)) return 0; + if (ReferenceEquals(null, other)) return 1; + var pageEnumComparison = PageEnum.CompareTo(other.PageEnum); + return pageEnumComparison != 0 ? pageEnumComparison : string.Compare(Url, other.Url, StringComparison.Ordinal); + } + public override bool Equals(object? obj) { if (obj is not RankingUrl rankingUrl) return false; @@ -187,12 +195,4 @@ public static bool AreSimilar(RankingUrl urlA, RankingUrl urlB) return true; } - - public int CompareTo(RankingUrl? other) - { - if (ReferenceEquals(this, other)) return 0; - if (ReferenceEquals(null, other)) return 1; - var pageEnumComparison = PageEnum.CompareTo(other.PageEnum); - return pageEnumComparison != 0 ? pageEnumComparison : string.Compare(Url, other.Url, StringComparison.Ordinal); - } } \ No newline at end of file From 7ff4df14a1a2fc7d0618f66f3a80800473449e5a Mon Sep 17 00:00:00 2001 From: user Date: Mon, 14 Aug 2023 12:15:49 +0200 Subject: [PATCH 4/5] Update RankingUrl.cs --- .../Objects/RankingNS/RankingUrl.cs | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs b/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs index 2004c16c..6145d214 100644 --- a/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs +++ b/PoliNetwork.Graduatorie.Common/Objects/RankingNS/RankingUrl.cs @@ -10,7 +10,7 @@ namespace PoliNetwork.Graduatorie.Common.Objects.RankingNS; [Serializable] [JsonObject(MemberSerialization.Fields, NamingStrategyType = typeof(CamelCaseNamingStrategy))] -public class RankingUrl : IComparable +public class RankingUrl : IComparable, IEquatable { public PageEnum PageEnum = PageEnum.Unknown; public string Url = ""; @@ -23,6 +23,13 @@ public int CompareTo(RankingUrl? other) return pageEnumComparison != 0 ? pageEnumComparison : string.Compare(Url, other.Url, StringComparison.Ordinal); } + public bool Equals(RankingUrl? other) + { + if (other == null) + return false; + return PageEnum == other.PageEnum && Url == other.Url; + } + public override bool Equals(object? obj) { if (obj is not RankingUrl rankingUrl) return false; @@ -37,11 +44,6 @@ public override int GetHashCode() return PageEnum.GetHashCode() ^ urlHash; } - protected bool Equals(RankingUrl other) - { - return PageEnum == other.PageEnum && Url == other.Url; - } - public int GetHashWithoutLastUpdate() { @@ -56,7 +58,7 @@ public int GetHashWithoutLastUpdate() /// /// /// The full url string - /// prefered input -> http://www.risultati-ammissione.polimi.it/2022_20064_html/2022_20064_generale.html + /// preferred input -> http://www.risultati-ammissione.polimi.it/2022_20064_html/2022_20064_generale.html /// valid case -> /2022_20064_html/2022_20064_generale.html /// /// RankingUrl From f2868193b38c51478a9ebef690696b276e47795d Mon Sep 17 00:00:00 2001 From: user Date: Mon, 14 Aug 2023 12:06:44 +0200 Subject: [PATCH 5/5] Revert "Update .gitignore" This reverts commit 59450561cc5e0c9834177c21f203689b9730ebfb. --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0c111eea..09ac4923 100644 --- a/.gitignore +++ b/.gitignore @@ -483,7 +483,7 @@ $RECYCLE.BIN/ .idea/* - +data dati RankingsDati rankingsdati