aaru-dps/Aaru.Server
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.Server.git synced 2025-12-16 19:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use name/count model.

Browse Source
This commit is contained in:
Natalia Portillo
2019-12-03 22:42:49 +00:00
parent e380126937
commit a0fafabb2c
15 changed files with 2329 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
DiscImageChef.Server/Areas/Admin/Controllers/VersionsController.cs
View File

@@ -15,6 +15,6 @@ namespace DiscImageChef.Server.Areas.Admin.Controllers
public VersionsController(DicServerContext context) => _context = context;
// GET: Admin/Versions
public async Task<IActionResult> Index() => View(await _context.Versions.OrderBy(v => v.Value).ToListAsync());
public async Task<IActionResult> Index() => View(await _context.Versions.OrderBy(v => v.Name).ToListAsync());
}
}

4
DiscImageChef.Server/Areas/Admin/Views/Versions/Index.cshtml
View File

@@ -38,7 +38,7 @@
<thead>
<tr>
<th>
@Html.DisplayNameFor(model => model.Value)
@Html.DisplayNameFor(model => model.Name)
</th>
<th>
@Html.DisplayNameFor(model => model.Count)
@@ -51,7 +51,7 @@
{
<tr>
<td>
@Html.DisplayFor(modelItem => item.Value)
@Html.DisplayFor(modelItem => item.Name)
</td>
<td>
@Html.DisplayFor(modelItem => item.Count)

4
DiscImageChef.Server/Controllers/StatsController.cs
View File

@@ -114,7 +114,7 @@ namespace DiscImageChef.Server.Controllers
foreach(Version nvs in ctx.Versions)
versions.Add(new NameValueStats
{
name = nvs.Value == "previous" ? "Previous than 3.4.99.0" : nvs.Value, Value = nvs.Count
name = nvs.Name == "previous" ? "Previous than 3.4.99.0" : nvs.Name, Value = nvs.Count
});
ViewBag.repVersions = versions.OrderBy(ver => ver.name).ToList();
@@ -370,7 +370,7 @@ namespace DiscImageChef.Server.Controllers
string[][] result =
{
ctx.Versions.OrderByDescending(o => o.Count).Take(10).
Select(v => v.Value == "previous" ? "Previous than 3.4.99.0" : v.Value).ToArray(),
Select(v => v.Name == "previous" ? "Previous than 3.4.99.0" : v.Name).ToArray(),
ctx.Versions.OrderByDescending(o => o.Count).Take(10).Select(x => x.Count.ToString()).ToArray()
};

4
DiscImageChef.Server/Controllers/UploadStatsController.cs
View File

@@ -150,12 +150,12 @@ namespace DiscImageChef.Server.Controllers
if(newstats.Versions != null)
foreach(NameValueStats nvs in newstats.Versions)
{
Version existing = _ctx.Versions.FirstOrDefault(c => c.Value == nvs.name);
Version existing = _ctx.Versions.FirstOrDefault(c => c.Name == nvs.name);
if(existing == null)
_ctx.Versions.Add(new Version
{
Value = nvs.name, Count = nvs.Value
Name = nvs.name, Count = nvs.Value
});
else
existing.Count += nvs.Value;

8
DiscImageChef.Server/Core/StatsConverter.cs
View File

@@ -362,12 +362,12 @@ namespace DiscImageChef.Server
if(string.IsNullOrWhiteSpace(nvs.name))
continue;
Version existing = ctx.Versions.FirstOrDefault(c => c.Value == nvs.name);
Version existing = ctx.Versions.FirstOrDefault(c => c.Name == nvs.name);
if(existing == null)
ctx.Versions.Add(new Version
{
Count = nvs.Value, Value = nvs.name
Count = nvs.Value, Name = nvs.name
});
else
existing.Count += nvs.Value;
@@ -375,12 +375,12 @@ namespace DiscImageChef.Server
}
else
{
Version existing = ctx.Versions.FirstOrDefault(c => c.Value == "previous");
Version existing = ctx.Versions.FirstOrDefault(c => c.Name == "previous");
if(existing == null)
ctx.Versions.Add(new Version
{
Count = 1, Value = "previous"
Count = 1, Name = "previous"
});
else
existing.Count++;

2290
DiscImageChef.Server/Migrations/20191203212552_NameCountModel.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

13
DiscImageChef.Server/Migrations/20191203212552_NameCountModel.cs Normal file
View File

@@ -0,0 +1,13 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace DiscImageChef.Server.Migrations
{
public partial class NameCountModel : Migration
{
protected override void Up(MigrationBuilder migrationBuilder) =>
migrationBuilder.Sql("ALTER TABLE Versions CHANGE `Value` `Name` LONGTEXT");
protected override void Down(MigrationBuilder migrationBuilder) =>
migrationBuilder.Sql("ALTER TABLE Versions CHANGE `Name` `Value` LONGTEXT");
}
}

2
DiscImageChef.Server/Migrations/DicServerContextModelSnapshot.cs
View File

@@ -1278,7 +1278,7 @@ namespace DiscImageChef.Server.Migrations
b.Property<long>("Count").HasColumnType("bigint");
b.Property<string>("Value").HasColumnType("longtext CHARACTER SET utf8mb4");
b.Property<string>("Name").HasColumnType("longtext CHARACTER SET utf8mb4");
b.HasKey("Id");

6
DiscImageChef.Server/Models/Command.cs
View File

@@ -32,9 +32,5 @@
namespace DiscImageChef.Server.Models
{
public class Command : BaseModel<int>
{
public string Name { get; set; }
public long Count { get; set; }
}
public class Command : NameCountModel<int> { }
}

6
DiscImageChef.Server/Models/Filesystem.cs
View File

@@ -32,9 +32,5 @@
namespace DiscImageChef.Server.Models
{
public class Filesystem : BaseModel<int>
{
public string Name { get; set; }
public long Count { get; set; }
}
public class Filesystem : NameCountModel<int> { }
}

6
DiscImageChef.Server/Models/Filter.cs
View File

@@ -32,9 +32,5 @@
namespace DiscImageChef.Server.Models
{
public class Filter : BaseModel<int>
{
public string Name { get; set; }
public long Count { get; set; }
}
public class Filter : NameCountModel<int> { }
}

6
DiscImageChef.Server/Models/MediaFormat.cs
View File

@@ -32,9 +32,5 @@
namespace DiscImageChef.Server.Models
{
public class MediaFormat : BaseModel<int>
{
public string Name { get; set; }
public long Count { get; set; }
}
public class MediaFormat : NameCountModel<int> { }
}

8
DiscImageChef.Server/Models/NameCountModel.cs Normal file
View File

@@ -0,0 +1,8 @@
namespace DiscImageChef.Server.Models
{
public class NameCountModel<T> : BaseModel<T>
{
public string Name { get; set; }
public long Count { get; set; }
}
}

6
DiscImageChef.Server/Models/Partition.cs
View File

@@ -32,9 +32,5 @@
namespace DiscImageChef.Server.Models
{
public class Partition : BaseModel<int>
{
public string Name { get; set; }
public long Count { get; set; }
}
public class Partition : NameCountModel<int> { }
}

6
DiscImageChef.Server/Models/Version.cs
View File

@@ -32,9 +32,5 @@
namespace DiscImageChef.Server.Models
{
public class Version : BaseModel<int>
{
public string Value { get; set; }
public long Count { get; set; }
}
public class Version : NameCountModel<int> { }
}