dockerapps/tv7playlist
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated DB Schema and added new initial create

Browse Source
This commit is contained in:
Philipp Häfelfinger
2019-01-30 22:49:01 +01:00
parent 273b960979
commit 15e2a650b9
14 changed files with 188 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Tv7Playlist/Controllers/HomeController.cs
View File

@@ -26,7 +26,7 @@ namespace Tv7Playlist.Controllers
[HttpGet]
public async Task<IActionResult> Index()
{
var playlistEntries = await _playlistContext.PlaylistEntries.AsNoTracking().OrderBy(e => e.TrackNumber).ToListAsync();
var playlistEntries = await _playlistContext.PlaylistEntries.AsNoTracking().OrderBy(e => e.Position).ToListAsync();
var model = new HomeModel(playlistEntries);
return View(model);

21
Tv7Playlist/Controllers/PlaylistApiController.cs
View File

@@ -25,11 +25,30 @@ namespace Tv7Playlist.Controllers
_appConfig = appConfig ?? throw new ArgumentNullException(nameof(appConfig));
}
[HttpGet]
[Route("without-proxy")]
public async Task<IActionResult> GetPlaylistWithoutProxy()
{
return await GetPlaylistInternal(false);
}
[HttpGet]
[Route("")]
public async Task<IActionResult> GetPlaylist()
{
var playlistStream = await _playlistBuilder.GeneratePlaylistAsync();
return await GetPlaylistInternal(true);
}
[HttpGet]
[Route("with-proxy")]
public async Task<IActionResult> GetPlaylistWithProxy()
{
return await GetPlaylistInternal(true);
}
private async Task<IActionResult> GetPlaylistInternal(bool useProxy)
{
var playlistStream = await _playlistBuilder.GeneratePlaylistAsync(useProxy);
var downloadFileName = GetDownloadFileName();
_logger.LogInformation(LoggingEvents.Playlist, "Sending updated playlist {filename}",

6
Tv7Playlist/Controllers/PlaylistEntryController.cs
View File

@@ -43,9 +43,11 @@ namespace Tv7Playlist.Controllers
if (entry == null) return NotFound();
entry.Position = updatedEntry.Position;
entry.TrackNumberOverride = updatedEntry.TrackNumberOverride;
entry.NameOverride = updatedEntry.NameOverride;
entry.ChannelNumberExport = updatedEntry.ChannelNumberExport;
entry.EpgMatchName = updatedEntry.EpgMatchName;
entry.IsEnabled = updatedEntry.IsEnabled;
entry.LogoUrl = updatedEntry.LogoUrl;
entry.Modified = DateTime.Now;
await _playlistContext.SaveChangesAsync();

22
Tv7Playlist/Views/Home/Index.cshtml
View File

@@ -8,15 +8,17 @@
<table class="table table-hover table-striped">
<tr>
<th></th>
<th>Number</th>
<th>Number override</th>
<th>Number Import</th>
<th>Number Export</th>
<th>Position</th>
<th>Name</th>
<th>Name override</th>
<th>EPG Name</th>
<th>Enabled</th>
<th>Available</th>
<th>URL</th>
<th>original URL</th>
<th>URL Proxy</th>
<th>URL Original</th>
<th>Created</th>
<th>Modified</th>
</tr>
@{
@@ -24,15 +26,17 @@
{
<tr>
<td><a class="btn btn-secondary" asp-area="" asp-controller="PlaylistEntry" asp-action="Edit" asp-route-id="@track.Id">Edit</a></td>
<td>@track.TrackNumber</td>
<td>@(track.TrackNumberOverride==0?string.Empty:track.TrackNumberOverride.ToString())</td>
<td>@track.ChannelNumberImport</td>
<td>@track.ChannelNumberExport</td>
<td>@track.Position</td>
<td>@track.Name</td>
<td>@track.NameOverride</td>
<td>@track.EpgMatchName</td>
<td>@track.IsEnabled</td>
<td>@track.IsAvailable</td>
<td>@track.Url</td>
<td>@track.UrlProxy</td>
<td>@track.UrlOriginal</td>
<td>@track.Created.ToString("g")</td>
<td>@track.Modified.ToString("g")</td>
</tr>
}
}

29
Tv7Playlist/Views/PlaylistEntry/Edit.cshtml
View File

@@ -1,17 +1,16 @@
@model Tv7Playlist.Data.PlaylistEntry;
@{
ViewData["Title"] = $"Edit channel {Model.TrackNumber} - {Model.Name}";
ViewData["Title"] = $"Edit channel {Model.ChannelNumberExport} - {Model.Name}";
}
<div class="row">
<div class="col col-12">
<h3>Edit channel @Model.TrackNumber - @Model.Name</h3>
<h3>Edit channel @Model.ChannelNumberExport - @Model.Name</h3>
</div>
</div>
<hr/>
<form asp-action="Edit" class="">
<input type="hidden" asp-for="Id"/>
@@ -54,25 +53,37 @@
<div class="form-group row">
<div class="offset-sm-2 col-sm-2">
<label asp-for="NameOverride" class="control-label">Name override:</label>
<label asp-for="EpgMatchName" class="control-label">EPG Name:</label>
</div>
<div class="col-sm-4">
<input asp-for="NameOverride" class="form-control"/>
<input asp-for="EpgMatchName" class="form-control"/>
</div>
<div class="col-sm-2">
<span asp-validation-for="NameOverride" class="text-danger"></span>
<span asp-validation-for="EpgMatchName" class="text-danger"></span>
</div>
</div>
<div class="form-group row">
<div class="offset-sm-2 col-sm-2">
<label asp-for="TrackNumberOverride" class="control-label">Track number override</label>
<label asp-for="ChannelNumberExport" class="control-label">Channel number export:</label>
</div>
<div class="col-sm-4">
<input asp-for="TrackNumberOverride" class="form-control"/>
<input asp-for="ChannelNumberExport" class="form-control"/>
</div>
<div class="col-sm-2">
<span asp-validation-for="TrackNumberOverride" class="text-danger"></span>
<span asp-validation-for="ChannelNumberExport" class="text-danger"></span>
</div>
</div>
<div class="form-group row">
<div class="offset-sm-2 col-sm-2">
<label asp-for="LogoUrl" class="control-label">Logo URL:</label>
</div>
<div class="col-sm-4">
<input asp-for="LogoUrl" class="form-control"/>
</div>
<div class="col-sm-2">
<span asp-validation-for="LogoUrl" class="text-danger"></span>
</div>
</div>

5
Tv7Playlist/Views/Shared/_Layout.cshtml
View File

@@ -32,7 +32,10 @@
<a class="nav-link text-dark" asp-area="" asp-controller="Home" asp-action="Synchronize">Synchronize playlist</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="PlaylistApi" asp-action="GetPlaylist">Download playlist / Copy this link to the list</a>
<a class="nav-link text-dark" asp-area="" asp-controller="PlaylistApi" asp-action="GetPlaylistWithProxy">Playlist with Proxy</a>
</li>
<li class="nav-item">
<a class="nav-link text-dark" asp-area="" asp-controller="PlaylistApi" asp-action="GetPlaylistWithoutProxy">Playlist without Proxy</a>
</li>
</ul>
</div>