timothy/ersatztv
1
0
Fork 0
Code Issues 51 Pull Requests 5 Actions Packages Projects Releases 9 Wiki Activity

rework watermarks (#261)

Browse Source 
* rework watermarks to be separate from channels

* update changelog
This commit is contained in:
Jason Dove
2021-06-14 10:29:58 -05:00
committed by GitHub
parent a0740de972
commit 72d967946d
45 changed files with 7095 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ErsatzTV.Infrastructure/Migrations/20210614095655_Add_ChannelWatermarkNameImage.Designer.cs
Generated
+2941
View File
File diff suppressed because it is too large Load Diff
ErsatzTV.Infrastructure/Migrations/20210614095655_Add_ChannelWatermarkNameImage.cs
+76
View File
@@ -0,0 +1,76 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace ErsatzTV.Infrastructure.Migrations
{
public partial class Add_ChannelWatermarkNameImage : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Channel_ChannelWatermark_WatermarkId",
table: "Channel");
migrationBuilder.DropIndex(
name: "IX_Channel_WatermarkId",
table: "Channel");
migrationBuilder.AddColumn<string>(
name: "Image",
table: "ChannelWatermark",
type: "TEXT",
nullable: true);
migrationBuilder.AddColumn<string>(
name: "Name",
table: "ChannelWatermark",
type: "TEXT",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_Channel_WatermarkId",
table: "Channel",
column: "WatermarkId");
migrationBuilder.AddForeignKey(
name: "FK_Channel_ChannelWatermark_WatermarkId",
table: "Channel",
column: "WatermarkId",
principalTable: "ChannelWatermark",
principalColumn: "Id",
onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Channel_ChannelWatermark_WatermarkId",
table: "Channel");
migrationBuilder.DropIndex(
name: "IX_Channel_WatermarkId",
table: "Channel");
migrationBuilder.DropColumn(
name: "Image",
table: "ChannelWatermark");
migrationBuilder.DropColumn(
name: "Name",
table: "ChannelWatermark");
migrationBuilder.CreateIndex(
name: "IX_Channel_WatermarkId",
table: "Channel",
column: "WatermarkId",
unique: true);
migrationBuilder.AddForeignKey(
name: "FK_Channel_ChannelWatermark_WatermarkId",
table: "Channel",
column: "WatermarkId",
principalTable: "ChannelWatermark",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
}
}
ErsatzTV.Infrastructure/Migrations/20210614144234_Add_ChannelWatermarkImageSource.Designer.cs
Generated
+2944
View File
File diff suppressed because it is too large Load Diff
ErsatzTV.Infrastructure/Migrations/20210614144234_Add_ChannelWatermarkImageSource.cs
+24
View File
@@ -0,0 +1,24 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace ErsatzTV.Infrastructure.Migrations
{
public partial class Add_ChannelWatermarkImageSource : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "ImageSource",
table: "ChannelWatermark",
type: "INTEGER",
nullable: false,
defaultValue: 0);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ImageSource",
table: "ChannelWatermark");
}
}
}
ErsatzTV.Infrastructure/Migrations/TvContextModelSnapshot.cs
+12 -10
View File
@@ -213,8 +213,7 @@ namespace ErsatzTV.Infrastructure.Migrations
b.HasIndex("Number")
.IsUnique();
b.HasIndex("WatermarkId")
.IsUnique();
b.HasIndex("WatermarkId");
b.ToTable("Channel");
});
@@ -234,12 +233,21 @@ namespace ErsatzTV.Infrastructure.Migrations
b.Property<int>("HorizontalMarginPercent")
.HasColumnType("INTEGER");
b.Property<string>("Image")
.HasColumnType("TEXT");
b.Property<int>("ImageSource")
.HasColumnType("INTEGER");
b.Property<int>("Location")
.HasColumnType("INTEGER");
b.Property<int>("Mode")
.HasColumnType("INTEGER");
b.Property<string>("Name")
.HasColumnType("TEXT");
b.Property<int>("Opacity")
.HasColumnType("INTEGER");
@@ -1845,9 +1853,8 @@ namespace ErsatzTV.Infrastructure.Migrations
.IsRequired();
b.HasOne("ErsatzTV.Core.Domain.ChannelWatermark", "Watermark")
.WithOne("Channel")
.HasForeignKey("ErsatzTV.Core.Domain.Channel", "WatermarkId")
.OnDelete(DeleteBehavior.Cascade);
.WithMany()
.HasForeignKey("WatermarkId");
b.Navigation("FFmpegProfile");
@@ -2736,11 +2743,6 @@ namespace ErsatzTV.Infrastructure.Migrations
b.Navigation("Playouts");
});
modelBuilder.Entity("ErsatzTV.Core.Domain.ChannelWatermark", b =>
{
b.Navigation("Channel");
});
modelBuilder.Entity("ErsatzTV.Core.Domain.Collection", b =>
{
b.Navigation("CollectionItems");