DumbYT
/
BackEnd
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Updated deps (hangfire, dotnet core, aspnet core, etc) and squashed migrations

This commit is contained in:
hak8or 2019-01-27 16:34:08 -05:00
parent 9b2ff546f0
commit 312dbdd8a5
14 changed files with 49 additions and 412 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -260,5 +260,5 @@ paket-files/
__pycache__/ __pycache__/
i*.pyc i*.pyc
# For Visual Studio Code # For Visual Studio Code.
*/.vscode/ .vscode

98
Migrations/20180304034317_initial.Designer.cs generated
View File

@ -1,98 +0,0 @@
// <auto-generated />
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.EntityFrameworkCore.Storage.Internal;
using System;
using System.Collections.Generic;
using YTManager;
namespace YTManager.Migrations
{
[DbContext(typeof(MediaDB))]
[Migration("20180304034317_initial")]
partial class initial
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
.HasAnnotation("ProductVersion", "2.0.1-rtm-125");
modelBuilder.Entity("YTManager.Models.Channel", b =>
{
b.Property<long>("PrimaryKey")
.ValueGeneratedOnAdd();
b.Property<DateTime>("AddedtoDB");
b.Property<string>("Description")
.IsRequired();
b.Property<DateTime>("Refreshed");
b.Property<string>("ThumbnailURL")
.IsRequired();
b.Property<string>("Title")
.IsRequired();
b.Property<List<string>>("UserTags");
b.Property<string>("YoutubeID")
.IsRequired();
b.HasKey("PrimaryKey");
b.ToTable("Channels");
});
modelBuilder.Entity("YTManager.Models.Video", b =>
{
b.Property<long>("PrimaryKey")
.ValueGeneratedOnAdd();
b.Property<DateTime>("AddedToYT");
b.Property<DateTime>("AddedtoDB");
b.Property<long>("ChannelPrimaryKey");
b.Property<string>("Description")
.IsRequired();
b.Property<TimeSpan>("Duration");
b.Property<List<string>>("Tags")
.IsRequired();
b.Property<string>("ThumbnailURL")
.IsRequired();
b.Property<string>("Title")
.IsRequired();
b.Property<string>("YoutubeID")
.IsRequired();
b.HasKey("PrimaryKey");
b.HasIndex("ChannelPrimaryKey");
b.ToTable("Videos");
});
modelBuilder.Entity("YTManager.Models.Video", b =>
{
b.HasOne("YTManager.Models.Channel", "Channel")
.WithMany("Videos")
.HasForeignKey("ChannelPrimaryKey")
.OnDelete(DeleteBehavior.Cascade);
});
#pragma warning restore 612, 618
}
}
}

98
Migrations/20180305045634_Tag change.Designer.cs generated
View File

@ -1,98 +0,0 @@
// <auto-generated />
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.EntityFrameworkCore.Storage.Internal;
using System;
using System.Collections.Generic;
using YTManager;
namespace YTManager.Migrations
{
[DbContext(typeof(MediaDB))]
[Migration("20180305045634_Tag change")]
partial class Tagchange
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
.HasAnnotation("ProductVersion", "2.0.1-rtm-125");
modelBuilder.Entity("YTManager.Models.Channel", b =>
{
b.Property<long>("PrimaryKey")
.ValueGeneratedOnAdd();
b.Property<DateTime>("AddedtoDB");
b.Property<string>("Description")
.IsRequired();
b.Property<DateTime>("Refreshed");
b.Property<string>("ThumbnailURL")
.IsRequired();
b.Property<string>("Title")
.IsRequired();
b.Property<List<string>>("UserTags");
b.Property<string>("YoutubeID")
.IsRequired();
b.HasKey("PrimaryKey");
b.ToTable("Channels");
});
modelBuilder.Entity("YTManager.Models.Video", b =>
{
b.Property<long>("PrimaryKey")
.ValueGeneratedOnAdd();
b.Property<DateTime>("AddedToYT");
b.Property<DateTime>("AddedtoDB");
b.Property<long>("ChannelPrimaryKey");
b.Property<string>("Description")
.IsRequired();
b.Property<TimeSpan>("Duration");
b.Property<List<string>>("Tags")
.IsRequired();
b.Property<string>("ThumbnailURL")
.IsRequired();
b.Property<string>("Title")
.IsRequired();
b.Property<string>("YoutubeID")
.IsRequired();
b.HasKey("PrimaryKey");
b.HasIndex("ChannelPrimaryKey");
b.ToTable("Videos");
});
modelBuilder.Entity("YTManager.Models.Video", b =>
{
b.HasOne("YTManager.Models.Channel", "Channel")
.WithMany("Videos")
.HasForeignKey("ChannelPrimaryKey")
.OnDelete(DeleteBehavior.Cascade);
});
#pragma warning restore 612, 618
}
}
}

19
Migrations/20180305045634_Tag change.cs
View File

@ -1,19 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
using System.Collections.Generic;
namespace YTManager.Migrations
{
public partial class Tagchange : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
}
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

99
Migrations/20180305052950_Made tags required.Designer.cs generated
View File

@ -1,99 +0,0 @@
// <auto-generated />
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.EntityFrameworkCore.Storage.Internal;
using System;
using System.Collections.Generic;
using YTManager;
namespace YTManager.Migrations
{
[DbContext(typeof(MediaDB))]
[Migration("20180305052950_Made tags required")]
partial class Madetagsrequired
{
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
.HasAnnotation("ProductVersion", "2.0.1-rtm-125");
modelBuilder.Entity("YTManager.Models.Channel", b =>
{
b.Property<long>("PrimaryKey")
.ValueGeneratedOnAdd();
b.Property<DateTime>("AddedtoDB");
b.Property<string>("Description")
.IsRequired();
b.Property<DateTime>("Refreshed");
b.Property<string>("ThumbnailURL")
.IsRequired();
b.Property<string>("Title")
.IsRequired();
b.Property<string[]>("UserTags")
.IsRequired();
b.Property<string>("YoutubeID")
.IsRequired();
b.HasKey("PrimaryKey");
b.ToTable("Channels");
});
modelBuilder.Entity("YTManager.Models.Video", b =>
{
b.Property<long>("PrimaryKey")
.ValueGeneratedOnAdd();
b.Property<DateTime>("AddedToYT");
b.Property<DateTime>("AddedtoDB");
b.Property<long>("ChannelPrimaryKey");
b.Property<string>("Description")
.IsRequired();
b.Property<TimeSpan>("Duration");
b.Property<List<string>>("Tags")
.IsRequired();
b.Property<string>("ThumbnailURL")
.IsRequired();
b.Property<string>("Title")
.IsRequired();
b.Property<string>("YoutubeID")
.IsRequired();
b.HasKey("PrimaryKey");
b.HasIndex("ChannelPrimaryKey");
b.ToTable("Videos");
});
modelBuilder.Entity("YTManager.Models.Video", b =>
{
b.HasOne("YTManager.Models.Channel", "Channel")
.WithMany("Videos")
.HasForeignKey("ChannelPrimaryKey")
.OnDelete(DeleteBehavior.Cascade);
});
#pragma warning restore 612, 618
}
}
}

28
Migrations/20180305052950_Made tags required.cs
View File

@ -1,28 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
using System.Collections.Generic;
namespace YTManager.Migrations
{
public partial class Madetagsrequired : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string[]>(
name: "UserTags",
table: "Channels",
nullable: false,
oldClrType: typeof(List<string>),
oldNullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<List<string>>(
name: "UserTags",
table: "Channels",
nullable: true,
oldClrType: typeof(string[]));
}
}
}

19
Migrations/20180305055427_Fixed videos tags.cs
View File

@ -1,19 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
using System;
using System.Collections.Generic;
namespace YTManager.Migrations
{
public partial class Fixedvideostags : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
}
protected override void Down(MigrationBuilder migrationBuilder)
{
}
}
}

14
Migrations/20180305055427_Fixed videos tags.Designer.cs → Migrations/20190127210534_initial.Designer.cs generated
View File

@ -1,25 +1,25 @@
// <auto-generated /> // <auto-generated />
using System;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Microsoft.EntityFrameworkCore.Storage.Internal; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using System;
using YTManager; using YTManager;
namespace YTManager.Migrations namespace YTManager.Migrations
{ {
[DbContext(typeof(MediaDB))] [DbContext(typeof(MediaDB))]
[Migration("20180305055427_Fixed videos tags")] [Migration("20190127210534_initial")]
partial class Fixedvideostags partial class initial
{ {
protected override void BuildTargetModel(ModelBuilder modelBuilder) protected override void BuildTargetModel(ModelBuilder modelBuilder)
{ {
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn) .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
.HasAnnotation("ProductVersion", "2.0.1-rtm-125"); .HasAnnotation("ProductVersion", "2.2.1-servicing-10028")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
modelBuilder.Entity("YTManager.Models.Channel", b => modelBuilder.Entity("YTManager.Models.Channel", b =>
{ {

29
Migrations/20180304034317_initial.cs → Migrations/20190127210534_initial.cs
View File

@ -1,7 +1,6 @@
using Microsoft.EntityFrameworkCore.Metadata; using System;
using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations;
using System; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using System.Collections.Generic;
namespace YTManager.Migrations namespace YTManager.Migrations
{ {
@ -15,13 +14,13 @@ namespace YTManager.Migrations
{ {
PrimaryKey = table.Column<long>(nullable: false) PrimaryKey = table.Column<long>(nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn), .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn),
AddedtoDB = table.Column<DateTime>(nullable: false),
Description = table.Column<string>(nullable: false),
Refreshed = table.Column<DateTime>(nullable: false),
ThumbnailURL = table.Column<string>(nullable: false),
Title = table.Column<string>(nullable: false), Title = table.Column<string>(nullable: false),
UserTags = table.Column<List<string>>(nullable: true), Description = table.Column<string>(nullable: false),
YoutubeID = table.Column<string>(nullable: false) ThumbnailURL = table.Column<string>(nullable: false),
YoutubeID = table.Column<string>(nullable: false),
AddedtoDB = table.Column<DateTime>(nullable: false),
Refreshed = table.Column<DateTime>(nullable: false),
UserTags = table.Column<string[]>(nullable: false)
}, },
constraints: table => constraints: table =>
{ {
@ -34,15 +33,15 @@ namespace YTManager.Migrations
{ {
PrimaryKey = table.Column<long>(nullable: false) PrimaryKey = table.Column<long>(nullable: false)
.Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn), .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn),
Title = table.Column<string>(nullable: false),
Description = table.Column<string>(nullable: false),
YoutubeID = table.Column<string>(nullable: false),
ThumbnailURL = table.Column<string>(nullable: false),
AddedToYT = table.Column<DateTime>(nullable: false), AddedToYT = table.Column<DateTime>(nullable: false),
AddedtoDB = table.Column<DateTime>(nullable: false), AddedtoDB = table.Column<DateTime>(nullable: false),
ChannelPrimaryKey = table.Column<long>(nullable: false),
Description = table.Column<string>(nullable: false),
Duration = table.Column<TimeSpan>(nullable: false), Duration = table.Column<TimeSpan>(nullable: false),
Tags = table.Column<List<string>>(nullable: false), ChannelPrimaryKey = table.Column<long>(nullable: false),
ThumbnailURL = table.Column<string>(nullable: false), Tags = table.Column<string[]>(nullable: false)
Title = table.Column<string>(nullable: false),
YoutubeID = table.Column<string>(nullable: false)
}, },
constraints: table => constraints: table =>
{ {

11
Migrations/MediaDBModelSnapshot.cs
View File

@ -1,11 +1,9 @@
// <auto-generated /> // <auto-generated />
using System;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
using Microsoft.EntityFrameworkCore.Migrations; using Npgsql.EntityFrameworkCore.PostgreSQL.Metadata;
using Microsoft.EntityFrameworkCore.Storage;
using Microsoft.EntityFrameworkCore.Storage.Internal;
using System;
using YTManager; using YTManager;
namespace YTManager.Migrations namespace YTManager.Migrations
@ -18,7 +16,8 @@ namespace YTManager.Migrations
#pragma warning disable 612, 618 #pragma warning disable 612, 618
modelBuilder modelBuilder
.HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn) .HasAnnotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.SerialColumn)
.HasAnnotation("ProductVersion", "2.0.1-rtm-125"); .HasAnnotation("ProductVersion", "2.2.1-servicing-10028")
.HasAnnotation("Relational:MaxIdentifierLength", 63);
modelBuilder.Entity("YTManager.Models.Channel", b => modelBuilder.Entity("YTManager.Models.Channel", b =>
{ {

2
Properties/launchSettings.json
View File

@ -20,7 +20,7 @@
"commandName": "Project", "commandName": "Project",
"launchUrl": "api/values", "launchUrl": "api/values",
"environmentVariables": { "environmentVariables": {
"POSTGRESQL_DBSTR": "Server=192.168.1.2;Port=32768;Database=postgres;User Id=postgres;", "POSTGRESQL_DBSTR": "Server=localhost;Port=32768;Database=DumbYT;User Id=DumbYT;Password=DumbYTPassword;",
"ASPNETCORE_ENVIRONMENT": "Development" "ASPNETCORE_ENVIRONMENT": "Development"
}, },
"applicationUrl": "http://localhost:62214/" "applicationUrl": "http://localhost:62214/"

2
Startup.cs
View File

@ -18,7 +18,7 @@ namespace YTManager {
public static string DBStr { public static string DBStr {
get { get {
string s = Environment.GetEnvironmentVariable("POSTGRESQL_DBSTR"); string s = Environment.GetEnvironmentVariable("POSTGRESQL_DBSTR");
s = s ?? "Server=localhost;Port=32768;Database=postgres;User Id=postgres;"; s = s ?? "Server=localhost;Port=32768;Database=DumbYT;User Id=DumbYT;Password=DumbYTPassword;";
return s; return s;
} }
} }

28
YTManager.csproj
View File

@ -1,38 +1,38 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework> <TargetFramework>netcoreapp2.2</TargetFramework>
<TypeScriptToolsVersion>2.5</TypeScriptToolsVersion> <TypeScriptToolsVersion>2.5</TypeScriptToolsVersion>
</PropertyGroup> </PropertyGroup>
<!-- Job System --> <!-- Job System -->
<ItemGroup> <ItemGroup>
<PackageReference Include="Hangfire" Version="1.6.17" /> <PackageReference Include="Hangfire" Version="1.6.22" />
<PackageReference Include="Hangfire.AspNetCore" Version="1.6.17" /> <PackageReference Include="Hangfire.AspNetCore" Version="1.6.22" />
<PackageReference Include="Hangfire.PostgreSql" Version="1.4.8.1" /> <PackageReference Include="Hangfire.PostgreSql" Version="1.5.0" />
</ItemGroup> </ItemGroup>
<!-- Database --> <!-- Database -->
<ItemGroup> <ItemGroup>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.0.0" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="2.2.0" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.1" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.1" />
</ItemGroup> </ItemGroup>
<!-- Backend Website --> <!-- Backend Website -->
<ItemGroup> <ItemGroup>
<PackageReference Include="Google.Apis.YouTube.v3" Version="1.32.2.1131" /> <PackageReference Include="Google.Apis.YouTube.v3" Version="1.37.0.1469" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.5" /> <PackageReference Include="Microsoft.AspNetCore.All" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.0.1" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="2.2.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.0.1" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.1" />
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.0.2" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.1" />
</ItemGroup> </ItemGroup>
<!-- So we can run dotnet migration ... --> <!-- So we can run dotnet migration ... -->
<ItemGroup> <ItemGroup>
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.2" /> <DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.4" />
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.1" /> <DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="2.0.3" />
</ItemGroup> </ItemGroup>
</Project> </Project>

10
dumbyt_dotnet.service
View File

@ -4,8 +4,8 @@ After=network-online.target
Wants=network-online.target systemd-networkd-wait-online.service Wants=network-online.target systemd-networkd-wait-online.service
[Service] [Service]
WorkingDirectory=/root/BackEnd/bin/Debug/netcoreapp2.0/ WorkingDirectory=/var/www/BackEnd/bin/Release/netcoreapp2.0/
ExecStart=/usr/bin/dotnet /root/BackEnd/bin/Debug/netcoreapp2.0/YTManager.dll ExecStart=/usr/bin/dotnet /var/www/BackEnd/bin/Release/netcoreapp2.0/YTManager.dll
; Restart configuration ; Restart configuration
Restart=always Restart=always
@ -14,13 +14,13 @@ Restart=always
SyslogIdentifier=dumbyt_dotnet SyslogIdentifier=dumbyt_dotnet
; User and Cgroup the process will run as. ; User and Cgroup the process will run as.
User=root User=hak8or
Group=root Group=hak8or
Environment=ASPNETCORE_ENVIRONMENT=Production Environment=ASPNETCORE_ENVIRONMENT=Production
Environment=DOTNET_PRINT_TELEMETRY_MESSAGE=false Environment=DOTNET_PRINT_TELEMETRY_MESSAGE=false
Environment=ASPNETCORE_URLS="http://*:62214" Environment=ASPNETCORE_URLS="http://*:62214"
Environment=POSTGRESQL_DBSTR="Server=192.168.1.2;Port=32768;Database=postgres;User Id=postgres;" Environment=POSTGRESQL_DBSTR="Server=10.10.10.200;Port=32768;Database=DumbYT;User Id=DumbYT;Password=DumbYT;"
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target