StarMirror/BuildFeed
1
0
Fork 0
mirror of https://gitlab.com/buildfeed/BuildFeed.git synced 2024-03-22 21:10:34 +08:00
Code Issues Projects Releases Wiki Activity

Tweaks; Code style fixes

Browse Source
This commit is contained in:
Thomas Hounsell 2017-05-13 23:38:30 +01:00
parent af52088f8a
commit 9222e1f86d
10 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BuildFeed.Model/Build.cs
View File

@ -140,7 +140,7 @@ private void GenerateFamily()
{ {
Family = ProjectFamily.Redstone2; Family = ProjectFamily.Redstone2;
} }
else if(Lab?.StartsWith("rs1", StringComparison.InvariantCultureIgnoreCase) ?? false) else if (Lab?.StartsWith("rs1", StringComparison.InvariantCultureIgnoreCase) ?? false)
{ {
Family = ProjectFamily.Redstone; Family = ProjectFamily.Redstone;
} }

3
BuildFeed.Model/BuildDetails.cs
View File

@ -29,7 +29,8 @@ public class BuildDetails
public string Lab { get; set; } public string Lab { get; set; }
[Display(ResourceType = typeof(VariantTerms), Name = nameof(VariantTerms.Model_BuildTime))] [Display(ResourceType = typeof(VariantTerms), Name = nameof(VariantTerms.Model_BuildTime))]
[DisplayFormat(ConvertEmptyStringToNull = true, ApplyFormatInEditMode = true, [DisplayFormat(ConvertEmptyStringToNull = true,
ApplyFormatInEditMode = true,
DataFormatString = "{0:yyMMdd-HHmm}")] DataFormatString = "{0:yyMMdd-HHmm}")]
public DateTime? BuildTime { get; set; } public DateTime? BuildTime { get; set; }

9
BuildFeed.Model/BuildRepository.cs
View File

@ -1,7 +1,6 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel; using System.ComponentModel;
using System.Configuration;
using System.Linq; using System.Linq;
using System.Threading.Tasks; using System.Threading.Tasks;
using BuildFeed.Model.View; using BuildFeed.Model.View;
@ -142,7 +141,7 @@ public async Task<FrontPage> SelectFrontPage(ProjectFamily family)
IFindFluent<Build, Build> query = _buildCollection.Find(new BsonDocument IFindFluent<Build, Build> query = _buildCollection.Find(new BsonDocument
{ {
{ "$where", "!this.LabUrl.contains(\"xbox\")"}, {"$where", "!this.LabUrl.contains(\"xbox\")"},
{ {
nameof(Build.Family), family nameof(Build.Family), family
} }
@ -151,7 +150,7 @@ public async Task<FrontPage> SelectFrontPage(ProjectFamily family)
query = _buildCollection.Find(new BsonDocument query = _buildCollection.Find(new BsonDocument
{ {
{ "$where", "!this.LabUrl.contains(\"xbox\")"}, {"$where", "!this.LabUrl.contains(\"xbox\")"},
{ {
nameof(Build.Family), family nameof(Build.Family), family
}, },
@ -175,7 +174,7 @@ public async Task<FrontPage> SelectFrontPage(ProjectFamily family)
query = _buildCollection.Find(new BsonDocument query = _buildCollection.Find(new BsonDocument
{ {
{ "$where", "((this.MajorVersion === 10 && this.LabUrl.contains(\"_release\")) || this.MajorVersion < 10) && !this.LabUrl.contains(\"xbox\")"}, {"$where", "((this.MajorVersion === 10 && this.LabUrl.contains(\"_release\")) || this.MajorVersion < 10) && !this.LabUrl.contains(\"xbox\")"},
{ {
nameof(Build.Family), family nameof(Build.Family), family
}, },
@ -196,7 +195,7 @@ public async Task<FrontPage> SelectFrontPage(ProjectFamily family)
query = _buildCollection.Find(new BsonDocument query = _buildCollection.Find(new BsonDocument
{ {
{ "$where", "this.LabUrl.contains(\"xbox\")"}, {"$where", "this.LabUrl.contains(\"xbox\")"},
{ {
nameof(Build.Family), family nameof(Build.Family), family
} }

2
BuildFeed.Model/ProjectFamily.cs
View File

@ -48,7 +48,7 @@ public enum ProjectFamily
[Display(Name = "Redstone 2 (Feature Update)")] [Display(Name = "Redstone 2 (Feature Update)")]
Feature2 = 41, Feature2 = 41,
[Display(Name = "Redstone 3")] [Display(Name = "Redstone 3", Description = "Windows 10 (Fall Creators Update)")]
Redstone3 = 50 Redstone3 = 50
} }
} }

2
BuildFeed/Code/Base32Encoding.cs
View File

@ -86,7 +86,9 @@ public static string ToString(byte[] input)
{ {
returnArray[arrayIndex++] = ValueToChar(nextChar); returnArray[arrayIndex++] = ValueToChar(nextChar);
while (arrayIndex != charCount) while (arrayIndex != charCount)
{
returnArray[arrayIndex++] = '='; //padding returnArray[arrayIndex++] = '='; //padding
}
} }
return new string(returnArray); return new string(returnArray);

10
BuildFeed/Code/DisplayHelpers.cs
View File

@ -10,7 +10,8 @@ namespace BuildFeed.Code
{ {
public static class MvcExtensions public static class MvcExtensions
{ {
public static IHtmlString CheckboxListForEnum<T>(this HtmlHelper html, string id, T currentItem) where T : struct public static IHtmlString CheckboxListForEnum<T>(this HtmlHelper html, string id, T currentItem)
where T : struct
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
@ -53,7 +54,12 @@ public static IHtmlString CheckboxListForEnum<T>(this HtmlHelper html, string id
public static string GetDisplayTextForEnum(object o) public static string GetDisplayTextForEnum(object o)
{ {
string result = null; string result = null;
DisplayAttribute display = o.GetType().GetMember(o.ToString()).First().GetCustomAttributes(false).OfType<DisplayAttribute>().LastOrDefault(); DisplayAttribute display = o.GetType()
.GetMember(o.ToString())
.First()
.GetCustomAttributes(false)
.OfType<DisplayAttribute>()
.LastOrDefault();
if (display != null) if (display != null)
{ {

2
BuildFeed/Code/OneSignalHelper.cs
View File

@ -22,7 +22,7 @@ public static void PushNewBuild(this OneSignalClient osc, Build build, string ur
#if DEBUG #if DEBUG
"Testers" "Testers"
#else #else
"All" "All"
#endif #endif
}, },
Headings = Headings =

5
BuildFeed/Views/support/credits.cshtml
View File

@ -87,9 +87,10 @@
<dd>Fuhrer_Adolf&ensp;<a target="_blank" rel="nofollow" href="https://twitter.com/Fuhrer_Adolf"><i class="fa fa-twitter"></i></a></dd> <dd>Fuhrer_Adolf&ensp;<a target="_blank" rel="nofollow" href="https://twitter.com/Fuhrer_Adolf"><i class="fa fa-twitter"></i></a></dd>
<dt>Vietnamese (@System.Globalization.CultureInfo.GetCultureInfo("vi").NativeName) Translation</dt> <dt>Vietnamese (@System.Globalization.CultureInfo.GetCultureInfo("vi").NativeName) Translation</dt>
<dd>Trần Kim Long Hải&ensp;<a target="_blank" rel="nofollow" href="https://twitter.com/trankimlonghai"><i class="fa fa-twitter"></i></a></dd> <dd>Trần Kim Long Hải&ensp;<a target="_blank" rel="nofollow" href="https://twitter.com/trankimlonghai"><i class="fa fa-twitter"></i></a></dd>
<dt>Chinese - Simplified (@System.Globalization.CultureInfo.GetCultureInfo("zh-cn").NativeName) Translation</dt> <dt>Chinese - Simplified (@System.Globalization.CultureInfo.GetCultureInfo("zh-hans").NativeName) Translation</dt>
<dd>Zheng He&ensp;<a target="_blank" rel="nofollow" href="http://www.betaworld.cn/"><i class="fa fa-globe"></i></a></dd> <dd>Zheng He&ensp;<a target="_blank" rel="nofollow" href="http://www.betaworld.cn/"><i class="fa fa-globe"></i></a></dd>
<dt>Chinese - Traditional (@System.Globalization.CultureInfo.GetCultureInfo("zh-tw").NativeName) Translation</dt> <dt>Chinese - Traditional (@System.Globalization.CultureInfo.GetCultureInfo("zh-hant").NativeName) Translation</dt>
<dd>Andrew Huang&ensp;<a target="_blank" rel="nofollow" href="https://twitter.com/AndrewDev8383"><i class="fa fa-twitter"></i></a>&ensp;<a target="_blank" rel="nofollow" href="http://isite.tw/"><i class="fa fa-globe"></i></a></dd> <dd>Andrew Huang&ensp;<a target="_blank" rel="nofollow" href="https://twitter.com/AndrewDev8383"><i class="fa fa-twitter"></i></a>&ensp;<a target="_blank" rel="nofollow" href="http://isite.tw/"><i class="fa fa-globe"></i></a></dd>
<dd>Link Chu&ensp;<a target="_blank" rel="nofollow" href="https://twitter.com/iliGPU"><i class="fa fa-twitter"></i></a>&ensp;<a target="_blank" rel="nofollow" href="https://github.com/kulaLin"><i class="fa fa-github"></i></a></dd>
</dl> </dl>
</div> </div>

25
BuildFeed/Views/support/sitemap.cshtml
View File

@ -1,4 +1,5 @@
@using BuildFeed.Model.View @using BuildFeed.Controllers
@using BuildFeed.Model.View
@model BuildFeed.Model.View.SitemapData @model BuildFeed.Model.View.SitemapData
@{ @{
ViewBag.Title = $"{VariantTerms.Common_Sitemap} | {InvariantTerms.SiteName}"; ViewBag.Title = $"{VariantTerms.Common_Sitemap} | {InvariantTerms.SiteName}";
@ -8,11 +9,11 @@
<ul> <ul>
<li> <li>
@Html.ActionLink("BuildFeed", "index", "build") @Html.ActionLink("BuildFeed", nameof(FrontController.Index), "Front")
<ul> <ul>
<li> <li>
<a href="#sitemap-builds" data-toggle="collapse">Builds</a> <a href="#sitemap-builds">Builds</a>
<ul id="sitemap-builds" class="collapse"> <ul id="sitemap-builds">
@foreach (SitemapDataBuildGroup buildGroup in Model.Builds) @foreach (SitemapDataBuildGroup buildGroup in Model.Builds)
{ {
<li> <li>
@ -42,8 +43,8 @@
@foreach (KeyValuePair<string, SitemapPagedAction[]> item in Model.Actions) @foreach (KeyValuePair<string, SitemapPagedAction[]> item in Model.Actions)
{ {
<li> <li>
<a href="#sitemap-@item.Key.ToLower()" data-toggle="collapse">@item.Key</a> <a href="#sitemap-@item.Key.ToLower()">@item.Key</a>
<ul id="sitemap-@item.Key.ToLower()" class="collapse"> <ul id="sitemap-@item.Key.ToLower()">
@foreach (SitemapPagedAction action in item.Value) @foreach (SitemapPagedAction action in item.Value)
{ {
if (string.IsNullOrEmpty(action.Name)) if (string.IsNullOrEmpty(action.Name))
@ -59,8 +60,8 @@
else else
{ {
<li> <li>
<a href="#sitemap-@action.UniqueId" data-toggle="collapse">@action.Name</a> <a href="#sitemap-@action.UniqueId">@action.Name</a>
<ul id="sitemap-@action.UniqueId" class="collapse"> <ul id="sitemap-@action.UniqueId">
<li>@Html.ActionLink("Page 1", action.Action, action.UrlParams)</li> <li>@Html.ActionLink("Page 1", action.Action, action.UrlParams)</li>
@for (int i = 2; i <= action.Pages; i++) @for (int i = 2; i <= action.Pages; i++)
{ {
@ -76,8 +77,8 @@
</li> </li>
} }
<li> <li>
<a href="#sitemap-rss" data-toggle="collapse">@VariantTerms.Common_RssFeeds</a> <a href="#sitemap-rss">@VariantTerms.Common_RssFeeds</a>
<ul id="sitemap-rss" class="collapse"> <ul id="sitemap-rss">
<li> <li>
<a href="@Url.Action("Index", new <a href="@Url.Action("Index", new
{ {
@ -107,8 +108,8 @@
<i class="fa fa-sm fa-rss"></i> @VariantTerms.Support_HighestVersion</a> <i class="fa fa-sm fa-rss"></i> @VariantTerms.Support_HighestVersion</a>
</li> </li>
<li> <li>
<a href="#rss-labs" data-toggle="collapse">@VariantTerms.Model_LabString</a> <a href="#rss-labs">@VariantTerms.Model_LabString</a>
<ul id="rss-labs" class="collapse"> <ul id="rss-labs">
@foreach (string lab in Model.Labs) @foreach (string lab in Model.Labs)
{ {
<li> <li>

6
BuildFeed/Web.config
View File

@ -8,10 +8,6 @@
<add key="ClientValidationEnabled" value="true" /> <add key="ClientValidationEnabled" value="true" />
<add key="UnobtrusiveJavaScriptEnabled" value="true" /> <add key="UnobtrusiveJavaScriptEnabled" value="true" />
<add key="data:MongoDB" value="BuildFeed" /> <add key="data:MongoDB" value="BuildFeed" />
<add key="site:OSGLab" value="rs_prerelease" />
<add key="site:InsiderLab" value="rs_prerelease" />
<add key="site:ReleaseLab" value="rs2_release;rs2_release_svc_sec;rs2_release_svc_escrow" />
<add key="site:XboxLab" value="rs2_release_xbox_1705" />
</appSettings> </appSettings>
<system.web> <system.web>
<compilation debug="true" targetFramework="4.7"> <compilation debug="true" targetFramework="4.7">
@ -91,9 +87,9 @@
<add name="X-Content-Type-Options" value="nosniff" /> <add name="X-Content-Type-Options" value="nosniff" />
<add name="X-Frame-Options" value="DENY" /> <add name="X-Frame-Options" value="DENY" />
<add name="X-XSS-Protection" value="1; mode=block" /> <add name="X-XSS-Protection" value="1; mode=block" />
<add name="Referrer-Policy" value="strict-origin-when-cross-origin" />
</customHeaders> </customHeaders>
</httpProtocol> </httpProtocol>
<handlers> <handlers>
<remove name="ExtensionlessUrlHandler-Integrated-4.0" /> <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
<remove name="OPTIONSVerbHandler" /> <remove name="OPTIONSVerbHandler" />