diff --git a/LANCommander/Data/Models/Server.cs b/LANCommander/Data/Models/Server.cs
index f9581a1..a783433 100644
--- a/LANCommander/Data/Models/Server.cs
+++ b/LANCommander/Data/Models/Server.cs
@@ -10,6 +10,8 @@
public string OnStartScriptPath { get; set; } = "";
public string OnStopScriptPath { get; set; } = "";
+ public bool UseShellExecute { get; set; }
public bool Autostart { get; set; }
+ public int AutostartDelay { get; set; }
}
}
diff --git a/LANCommander/Migrations/20230811190752_AddServerUseShellExecuteAndAutostartDelay.Designer.cs b/LANCommander/Migrations/20230811190752_AddServerUseShellExecuteAndAutostartDelay.Designer.cs
new file mode 100644
index 0000000..907ebf0
--- /dev/null
+++ b/LANCommander/Migrations/20230811190752_AddServerUseShellExecuteAndAutostartDelay.Designer.cs
@@ -0,0 +1,1325 @@
+//
+using System;
+using LANCommander.Data;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace LANCommander.Migrations
+{
+ [DbContext(typeof(DatabaseContext))]
+ [Migration("20230811190752_AddServerUseShellExecuteAndAutostartDelay")]
+ partial class AddServerUseShellExecuteAndAutostartDelay
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "7.0.9")
+ .HasAnnotation("Proxies:ChangeTracking", false)
+ .HasAnnotation("Proxies:CheckEquality", false)
+ .HasAnnotation("Proxies:LazyLoading", true);
+
+ modelBuilder.Entity("CategoryGame", b =>
+ {
+ b.Property("CategoriesId")
+ .HasColumnType("TEXT");
+
+ b.Property("GamesId")
+ .HasColumnType("TEXT");
+
+ b.HasKey("CategoriesId", "GamesId");
+
+ b.HasIndex("GamesId");
+
+ b.ToTable("CategoryGame");
+ });
+
+ modelBuilder.Entity("GameDeveloper", b =>
+ {
+ b.Property("DeveloperId")
+ .HasColumnType("TEXT");
+
+ b.Property("GameId")
+ .HasColumnType("TEXT");
+
+ b.HasKey("DeveloperId", "GameId");
+
+ b.HasIndex("GameId");
+
+ b.ToTable("GameDeveloper");
+ });
+
+ modelBuilder.Entity("GameGenre", b =>
+ {
+ b.Property("GamesId")
+ .HasColumnType("TEXT");
+
+ b.Property("GenresId")
+ .HasColumnType("TEXT");
+
+ b.HasKey("GamesId", "GenresId");
+
+ b.HasIndex("GenresId");
+
+ b.ToTable("GameGenre");
+ });
+
+ modelBuilder.Entity("GamePublisher", b =>
+ {
+ b.Property("GameId")
+ .HasColumnType("TEXT");
+
+ b.Property("PublisherId")
+ .HasColumnType("TEXT");
+
+ b.HasKey("GameId", "PublisherId");
+
+ b.HasIndex("PublisherId");
+
+ b.ToTable("GamePublisher");
+ });
+
+ modelBuilder.Entity("GameTag", b =>
+ {
+ b.Property("GamesId")
+ .HasColumnType("TEXT");
+
+ b.Property("TagsId")
+ .HasColumnType("TEXT");
+
+ b.HasKey("GamesId", "TagsId");
+
+ b.HasIndex("TagsId");
+
+ b.ToTable("GameTag");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Action", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("Arguments")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("GameId")
+ .HasColumnType("TEXT");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("Path")
+ .HasColumnType("TEXT");
+
+ b.Property("PrimaryAction")
+ .HasColumnType("INTEGER");
+
+ b.Property("SortOrder")
+ .HasColumnType("INTEGER");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("WorkingDirectory")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("GameId");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("Actions");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Archive", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("Changelog")
+ .HasColumnType("TEXT");
+
+ b.Property("CompressedSize")
+ .HasColumnType("INTEGER");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("GameId")
+ .HasColumnType("TEXT");
+
+ b.Property("LastVersionId")
+ .HasColumnType("TEXT");
+
+ b.Property("ObjectKey")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("UncompressedSize")
+ .HasColumnType("INTEGER");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Version")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("GameId");
+
+ b.HasIndex("LastVersionId");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("Archive");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Category", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("ParentId")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("ParentId");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("Categories");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Company", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("Companies");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Game", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Description")
+ .HasColumnType("TEXT");
+
+ b.Property("DirectoryName")
+ .HasColumnType("TEXT");
+
+ b.Property("IGDBId")
+ .HasColumnType("INTEGER");
+
+ b.Property("Icon")
+ .HasColumnType("TEXT");
+
+ b.Property("ReleasedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Singleplayer")
+ .HasColumnType("INTEGER");
+
+ b.Property("SortTitle")
+ .HasColumnType("TEXT");
+
+ b.Property("Title")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("ValidKeyRegex")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("Games");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.GameSave", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("GameId")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("UserId")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("GameId");
+
+ b.HasIndex("UpdatedById");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("GameSaves");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Genre", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("Genres");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Key", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("AllocationMethod")
+ .HasColumnType("INTEGER");
+
+ b.Property("ClaimedByComputerName")
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.Property("ClaimedByIpv4Address")
+ .HasMaxLength(15)
+ .HasColumnType("TEXT");
+
+ b.Property("ClaimedByMacAddress")
+ .HasMaxLength(17)
+ .HasColumnType("TEXT");
+
+ b.Property("ClaimedByUserId")
+ .HasColumnType("TEXT");
+
+ b.Property("ClaimedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("GameId")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Value")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("ClaimedByUserId");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("GameId");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("Keys");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.MultiplayerMode", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Description")
+ .HasColumnType("TEXT");
+
+ b.Property("GameId")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("MaxPlayers")
+ .HasColumnType("INTEGER");
+
+ b.Property("MinPlayers")
+ .HasColumnType("INTEGER");
+
+ b.Property("NetworkProtocol")
+ .HasColumnType("INTEGER");
+
+ b.Property("Spectators")
+ .HasColumnType("INTEGER");
+
+ b.Property("Type")
+ .HasColumnType("INTEGER");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("GameId");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("MultiplayerModes");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Role", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasColumnType("TEXT");
+
+ b.Property("Name")
+ .HasMaxLength(256)
+ .HasColumnType("TEXT");
+
+ b.Property("NormalizedName")
+ .HasMaxLength(256)
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedName")
+ .IsUnique()
+ .HasDatabaseName("RoleNameIndex");
+
+ b.ToTable("AspNetRoles", (string)null);
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.SavePath", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("GameId")
+ .HasColumnType("TEXT");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("Type")
+ .HasColumnType("INTEGER");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("GameId");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("SavePaths");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Script", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("Contents")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Description")
+ .HasColumnType("TEXT");
+
+ b.Property("GameId")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("RequiresAdmin")
+ .HasColumnType("INTEGER");
+
+ b.Property("Type")
+ .HasColumnType("INTEGER");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("GameId");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("Scripts");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Server", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("Arguments")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("Autostart")
+ .HasColumnType("INTEGER");
+
+ b.Property("AutostartDelay")
+ .HasColumnType("INTEGER");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("OnStartScriptPath")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("OnStopScriptPath")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("Path")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("UseShellExecute")
+ .HasColumnType("INTEGER");
+
+ b.Property("WorkingDirectory")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("Servers");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Tag", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("CreatedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("Name")
+ .IsRequired()
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedById")
+ .HasColumnType("TEXT");
+
+ b.Property("UpdatedOn")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("CreatedById");
+
+ b.HasIndex("UpdatedById");
+
+ b.ToTable("Tags");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.User", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("TEXT");
+
+ b.Property("AccessFailedCount")
+ .HasColumnType("INTEGER");
+
+ b.Property("Approved")
+ .HasColumnType("INTEGER");
+
+ b.Property("ApprovedOn")
+ .HasColumnType("TEXT");
+
+ b.Property("ConcurrencyStamp")
+ .IsConcurrencyToken()
+ .HasColumnType("TEXT");
+
+ b.Property("Email")
+ .HasMaxLength(256)
+ .HasColumnType("TEXT");
+
+ b.Property("EmailConfirmed")
+ .HasColumnType("INTEGER");
+
+ b.Property("LockoutEnabled")
+ .HasColumnType("INTEGER");
+
+ b.Property("LockoutEnd")
+ .HasColumnType("TEXT");
+
+ b.Property("NormalizedEmail")
+ .HasMaxLength(256)
+ .HasColumnType("TEXT");
+
+ b.Property("NormalizedUserName")
+ .HasMaxLength(256)
+ .HasColumnType("TEXT");
+
+ b.Property("PasswordHash")
+ .HasColumnType("TEXT");
+
+ b.Property("PhoneNumber")
+ .HasColumnType("TEXT");
+
+ b.Property("PhoneNumberConfirmed")
+ .HasColumnType("INTEGER");
+
+ b.Property("RefreshToken")
+ .HasColumnType("TEXT");
+
+ b.Property("RefreshTokenExpiration")
+ .HasColumnType("TEXT");
+
+ b.Property("SecurityStamp")
+ .HasColumnType("TEXT");
+
+ b.Property("TwoFactorEnabled")
+ .HasColumnType("INTEGER");
+
+ b.Property("UserName")
+ .HasMaxLength(256)
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("NormalizedEmail")
+ .HasDatabaseName("EmailIndex");
+
+ b.HasIndex("NormalizedUserName")
+ .IsUnique()
+ .HasDatabaseName("UserNameIndex");
+
+ b.ToTable("AspNetUsers", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER");
+
+ b.Property("ClaimType")
+ .HasColumnType("TEXT");
+
+ b.Property("ClaimValue")
+ .HasColumnType("TEXT");
+
+ b.Property("RoleId")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AspNetRoleClaims", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("INTEGER");
+
+ b.Property("ClaimType")
+ .HasColumnType("TEXT");
+
+ b.Property("ClaimValue")
+ .HasColumnType("TEXT");
+
+ b.Property("UserId")
+ .HasColumnType("TEXT");
+
+ b.HasKey("Id");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AspNetUserClaims", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.Property("LoginProvider")
+ .HasMaxLength(128)
+ .HasColumnType("TEXT");
+
+ b.Property("ProviderKey")
+ .HasMaxLength(128)
+ .HasColumnType("TEXT");
+
+ b.Property("ProviderDisplayName")
+ .HasColumnType("TEXT");
+
+ b.Property("UserId")
+ .HasColumnType("TEXT");
+
+ b.HasKey("LoginProvider", "ProviderKey");
+
+ b.HasIndex("UserId");
+
+ b.ToTable("AspNetUserLogins", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("TEXT");
+
+ b.Property("RoleId")
+ .HasColumnType("TEXT");
+
+ b.HasKey("UserId", "RoleId");
+
+ b.HasIndex("RoleId");
+
+ b.ToTable("AspNetUserRoles", (string)null);
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.Property("UserId")
+ .HasColumnType("TEXT");
+
+ b.Property("LoginProvider")
+ .HasMaxLength(128)
+ .HasColumnType("TEXT");
+
+ b.Property("Name")
+ .HasMaxLength(128)
+ .HasColumnType("TEXT");
+
+ b.Property("Value")
+ .HasColumnType("TEXT");
+
+ b.HasKey("UserId", "LoginProvider", "Name");
+
+ b.ToTable("AspNetUserTokens", (string)null);
+ });
+
+ modelBuilder.Entity("CategoryGame", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.Category", null)
+ .WithMany()
+ .HasForeignKey("CategoriesId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.Game", null)
+ .WithMany()
+ .HasForeignKey("GamesId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("GameDeveloper", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.Company", null)
+ .WithMany()
+ .HasForeignKey("DeveloperId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.Game", null)
+ .WithMany()
+ .HasForeignKey("GameId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("GameGenre", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.Game", null)
+ .WithMany()
+ .HasForeignKey("GamesId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.Genre", null)
+ .WithMany()
+ .HasForeignKey("GenresId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("GamePublisher", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.Game", null)
+ .WithMany()
+ .HasForeignKey("GameId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.Company", null)
+ .WithMany()
+ .HasForeignKey("PublisherId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("GameTag", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.Game", null)
+ .WithMany()
+ .HasForeignKey("GamesId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.Tag", null)
+ .WithMany()
+ .HasForeignKey("TagsId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Action", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.Game", "Game")
+ .WithMany("Actions")
+ .HasForeignKey("GameId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("Game");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Archive", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.Game", "Game")
+ .WithMany("Archives")
+ .HasForeignKey("GameId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.Archive", "LastVersion")
+ .WithMany()
+ .HasForeignKey("LastVersionId");
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("Game");
+
+ b.Navigation("LastVersion");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Category", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.Category", "Parent")
+ .WithMany("Children")
+ .HasForeignKey("ParentId");
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("Parent");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Company", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Game", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.GameSave", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.Game", "Game")
+ .WithMany("GameSaves")
+ .HasForeignKey("GameId")
+ .OnDelete(DeleteBehavior.NoAction)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.HasOne("LANCommander.Data.Models.User", "User")
+ .WithMany("GameSaves")
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("Game");
+
+ b.Navigation("UpdatedBy");
+
+ b.Navigation("User");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Genre", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Key", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "ClaimedByUser")
+ .WithMany()
+ .HasForeignKey("ClaimedByUserId");
+
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.Game", "Game")
+ .WithMany("Keys")
+ .HasForeignKey("GameId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("ClaimedByUser");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("Game");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.MultiplayerMode", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.Game", "Game")
+ .WithMany("MultiplayerModes")
+ .HasForeignKey("GameId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("Game");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.SavePath", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.Game", "Game")
+ .WithMany("SavePaths")
+ .HasForeignKey("GameId");
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("Game");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Script", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.Game", "Game")
+ .WithMany("Scripts")
+ .HasForeignKey("GameId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("Game");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Server", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Tag", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", "CreatedBy")
+ .WithMany()
+ .HasForeignKey("CreatedById");
+
+ b.HasOne("LANCommander.Data.Models.User", "UpdatedBy")
+ .WithMany()
+ .HasForeignKey("UpdatedById");
+
+ b.Navigation("CreatedBy");
+
+ b.Navigation("UpdatedBy");
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityRoleClaim", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.Role", null)
+ .WithMany()
+ .HasForeignKey("RoleId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserClaim", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserLogin", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserRole", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.Role", null)
+ .WithMany()
+ .HasForeignKey("RoleId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+
+ b.HasOne("LANCommander.Data.Models.User", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("Microsoft.AspNetCore.Identity.IdentityUserToken", b =>
+ {
+ b.HasOne("LANCommander.Data.Models.User", null)
+ .WithMany()
+ .HasForeignKey("UserId")
+ .OnDelete(DeleteBehavior.Cascade)
+ .IsRequired();
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Category", b =>
+ {
+ b.Navigation("Children");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.Game", b =>
+ {
+ b.Navigation("Actions");
+
+ b.Navigation("Archives");
+
+ b.Navigation("GameSaves");
+
+ b.Navigation("Keys");
+
+ b.Navigation("MultiplayerModes");
+
+ b.Navigation("SavePaths");
+
+ b.Navigation("Scripts");
+ });
+
+ modelBuilder.Entity("LANCommander.Data.Models.User", b =>
+ {
+ b.Navigation("GameSaves");
+ });
+#pragma warning restore 612, 618
+ }
+ }
+}
diff --git a/LANCommander/Migrations/20230811190752_AddServerUseShellExecuteAndAutostartDelay.cs b/LANCommander/Migrations/20230811190752_AddServerUseShellExecuteAndAutostartDelay.cs
new file mode 100644
index 0000000..fa1dd1b
--- /dev/null
+++ b/LANCommander/Migrations/20230811190752_AddServerUseShellExecuteAndAutostartDelay.cs
@@ -0,0 +1,41 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace LANCommander.Migrations
+{
+ ///
+ public partial class AddServerUseShellExecuteAndAutostartDelay : Migration
+ {
+ ///
+ protected override void Up(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.AddColumn(
+ name: "AutostartDelay",
+ table: "Servers",
+ type: "INTEGER",
+ nullable: false,
+ defaultValue: 0);
+
+ migrationBuilder.AddColumn(
+ name: "UseShellExecute",
+ table: "Servers",
+ type: "INTEGER",
+ nullable: false,
+ defaultValue: false);
+ }
+
+ ///
+ protected override void Down(MigrationBuilder migrationBuilder)
+ {
+ migrationBuilder.DropColumn(
+ name: "AutostartDelay",
+ table: "Servers");
+
+ migrationBuilder.DropColumn(
+ name: "UseShellExecute",
+ table: "Servers");
+ }
+ }
+}
diff --git a/LANCommander/Migrations/DatabaseContextModelSnapshot.cs b/LANCommander/Migrations/DatabaseContextModelSnapshot.cs
index 9bef70d..08789c1 100644
--- a/LANCommander/Migrations/DatabaseContextModelSnapshot.cs
+++ b/LANCommander/Migrations/DatabaseContextModelSnapshot.cs
@@ -15,7 +15,11 @@ namespace LANCommander.Migrations
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
- modelBuilder.HasAnnotation("ProductVersion", "6.0.8");
+ modelBuilder
+ .HasAnnotation("ProductVersion", "7.0.9")
+ .HasAnnotation("Proxies:ChangeTracking", false)
+ .HasAnnotation("Proxies:CheckEquality", false)
+ .HasAnnotation("Proxies:LazyLoading", true);
modelBuilder.Entity("CategoryGame", b =>
{
@@ -627,6 +631,9 @@ namespace LANCommander.Migrations
b.Property("Autostart")
.HasColumnType("INTEGER");
+ b.Property("AutostartDelay")
+ .HasColumnType("INTEGER");
+
b.Property("CreatedById")
.HasColumnType("TEXT");
@@ -655,6 +662,9 @@ namespace LANCommander.Migrations
b.Property("UpdatedOn")
.HasColumnType("TEXT");
+ b.Property("UseShellExecute")
+ .HasColumnType("INTEGER");
+
b.Property("WorkingDirectory")
.IsRequired()
.HasColumnType("TEXT");
@@ -708,6 +718,12 @@ namespace LANCommander.Migrations
b.Property("AccessFailedCount")
.HasColumnType("INTEGER");
+ b.Property("Approved")
+ .HasColumnType("INTEGER");
+
+ b.Property("ApprovedOn")
+ .HasColumnType("TEXT");
+
b.Property("ConcurrencyStamp")
.IsConcurrencyToken()
.HasColumnType("TEXT");
diff --git a/LANCommander/Pages/Servers/Edit.razor b/LANCommander/Pages/Servers/Edit.razor
index eb1e552..3fc6598 100644
--- a/LANCommander/Pages/Servers/Edit.razor
+++ b/LANCommander/Pages/Servers/Edit.razor
@@ -87,6 +87,20 @@
+
+
+
+
+
+
+ @if (context.Autostart)
+ {
+
+
+ Seconds
+
+
+ }
diff --git a/LANCommander/Program.cs b/LANCommander/Program.cs
index edfd75e..f26d5f1 100644
--- a/LANCommander/Program.cs
+++ b/LANCommander/Program.cs
@@ -161,11 +161,6 @@ app.UseEndpoints(endpoints =>
endpoints.MapControllers();
});
-// Migrate
-await using var scope = app.Services.CreateAsyncScope();
-using var db = scope.ServiceProvider.GetService();
-await db.Database.MigrateAsync();
-
if (!Directory.Exists("Upload"))
Directory.CreateDirectory("Upload");
@@ -178,4 +173,28 @@ if (!Directory.Exists("Saves"))
if (!Directory.Exists("Snippets"))
Directory.CreateDirectory("Snippets");
+// Migrate
+await using var scope = app.Services.CreateAsyncScope();
+using var db = scope.ServiceProvider.GetService();
+await db.Database.MigrateAsync();
+
+// Autostart any server processes
+var serverService = scope.ServiceProvider.GetService();
+var serverProcessService = scope.ServiceProvider.GetService();
+
+foreach (var server in await serverService.Get(s => s.Autostart).ToListAsync())
+{
+ try
+ {
+ if (server.AutostartDelay > 0)
+ await Task.Delay(server.AutostartDelay);
+
+ serverProcessService.StartServerAsync(server);
+ }
+ catch (Exception ex)
+ {
+
+ }
+}
+
app.Run();
\ No newline at end of file
diff --git a/LANCommander/Services/ServerProcessService.cs b/LANCommander/Services/ServerProcessService.cs
index ecddcd3..3545445 100644
--- a/LANCommander/Services/ServerProcessService.cs
+++ b/LANCommander/Services/ServerProcessService.cs
@@ -24,25 +24,32 @@ namespace LANCommander.Services
process.StartInfo.FileName = server.Path;
process.StartInfo.WorkingDirectory = server.WorkingDirectory;
process.StartInfo.Arguments = server.Arguments;
- process.StartInfo.UseShellExecute = false;
- process.StartInfo.RedirectStandardOutput = true;
- process.StartInfo.RedirectStandardError = true;
+ process.StartInfo.UseShellExecute = server.UseShellExecute;
process.EnableRaisingEvents = true;
- process.OutputDataReceived += new DataReceivedEventHandler((sender, e) =>
+ if (!process.StartInfo.UseShellExecute)
{
- Logger.Info("Game Server {ServerName} ({ServerId}) Info: {Message}", server.Name, server.Id, e.Data);
- });
+ process.StartInfo.RedirectStandardOutput = true;
+ process.StartInfo.RedirectStandardError = true;
- process.ErrorDataReceived += new DataReceivedEventHandler((sender, e) =>
- {
- Logger.Error("Game Server {ServerName} ({ServerId}) Error: {Message}", server.Name, server.Id, e.Data);
- });
+ process.OutputDataReceived += new DataReceivedEventHandler((sender, e) =>
+ {
+ Logger.Info("Game Server {ServerName} ({ServerId}) Info: {Message}", server.Name, server.Id, e.Data);
+ });
+
+ process.ErrorDataReceived += new DataReceivedEventHandler((sender, e) =>
+ {
+ Logger.Error("Game Server {ServerName} ({ServerId}) Error: {Message}", server.Name, server.Id, e.Data);
+ });
+ }
process.Start();
- process.BeginErrorReadLine();
- process.BeginOutputReadLine();
+ if (!process.StartInfo.UseShellExecute)
+ {
+ process.BeginErrorReadLine();
+ process.BeginOutputReadLine();
+ }
Processes[server.Id] = process;