mirror of
https://github.com/Prowlarr/Prowlarr.git
synced 2026-03-27 18:14:23 -04:00
Compare commits
6 Commits
v2.3.4.530
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5edde8d9bd | ||
|
|
ef5d670c39 | ||
|
|
f568906876 | ||
|
|
331e92ac62 | ||
|
|
ec46b25be2 | ||
|
|
8b3837cb6e |
@@ -9,7 +9,7 @@ variables:
|
|||||||
testsFolder: './_tests'
|
testsFolder: './_tests'
|
||||||
yarnCacheFolder: $(Pipeline.Workspace)/.yarn
|
yarnCacheFolder: $(Pipeline.Workspace)/.yarn
|
||||||
nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
|
nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
|
||||||
majorVersion: '2.3.4'
|
majorVersion: '2.3.5'
|
||||||
minorVersion: $[counter('minorVersion', 1)]
|
minorVersion: $[counter('minorVersion', 1)]
|
||||||
prowlarrVersion: '$(majorVersion).$(minorVersion)'
|
prowlarrVersion: '$(majorVersion).$(minorVersion)'
|
||||||
buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
|
buildName: '$(Build.SourceBranchName).$(prowlarrVersion)'
|
||||||
|
|||||||
@@ -5,6 +5,8 @@
|
|||||||
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
|
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
|
||||||
<add key="dotnet-bsd-crossbuild" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/dotnet-bsd-crossbuild/nuget/v3/index.json" />
|
<add key="dotnet-bsd-crossbuild" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/dotnet-bsd-crossbuild/nuget/v3/index.json" />
|
||||||
<add key="Mono.Posix.NETStandard" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/Mono.Posix.NETStandard/nuget/v3/index.json" />
|
<add key="Mono.Posix.NETStandard" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/Mono.Posix.NETStandard/nuget/v3/index.json" />
|
||||||
<add key="FluentMigrator" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/FluentMigrator/nuget/v3/index.json" />
|
<add key="SQLite" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/SQLite/nuget/v3/index.json" />
|
||||||
|
<add key="coverlet-nightly" value="https://pkgs.dev.azure.com/Servarr/coverlet/_packaging/coverlet-nightly/nuget/v3/index.json" />
|
||||||
|
<add key="FFMpegCore" value="https://pkgs.dev.azure.com/Servarr/Servarr/_packaging/FFMpegCore/nuget/v3/index.json" />
|
||||||
</packageSources>
|
</packageSources>
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|||||||
@@ -63,7 +63,23 @@ namespace NzbDrone.Common.Composition
|
|||||||
|
|
||||||
private static IntPtr LoadSqliteNativeLib(string libraryName, Assembly assembly, DllImportSearchPath? dllImportSearchPath)
|
private static IntPtr LoadSqliteNativeLib(string libraryName, Assembly assembly, DllImportSearchPath? dllImportSearchPath)
|
||||||
{
|
{
|
||||||
var mappedName = OsInfo.IsLinux && libraryName == "sqlite3" ? "libsqlite3.so.0" : libraryName;
|
ArgumentException.ThrowIfNullOrWhiteSpace(libraryName);
|
||||||
|
|
||||||
|
var mappedName = libraryName;
|
||||||
|
|
||||||
|
if (libraryName is "sqlite3" or "e_sqlite3")
|
||||||
|
{
|
||||||
|
if (OsInfo.IsLinux)
|
||||||
|
{
|
||||||
|
if (NativeLibrary.TryLoad(libraryName, assembly, dllImportSearchPath, out var libHandle))
|
||||||
|
{
|
||||||
|
return libHandle;
|
||||||
|
}
|
||||||
|
|
||||||
|
mappedName = "libsqlite3.so.0";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath);
|
return NativeLibrary.Load(mappedName, assembly, dllImportSearchPath);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,13 +6,14 @@ using NzbDrone.Common.Extensions;
|
|||||||
|
|
||||||
namespace NzbDrone.Common.Http
|
namespace NzbDrone.Common.Http
|
||||||
{
|
{
|
||||||
public class HttpUri : IEquatable<HttpUri>
|
public partial class HttpUri : IEquatable<HttpUri>
|
||||||
{
|
{
|
||||||
private static readonly Regex RegexUri = new Regex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-_A-Z0-9.]+|\[[[A-F0-9:]+\])(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/+)[^/?#\r\n]+)+/*|/+)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
private readonly string _uri;
|
private readonly string _uri;
|
||||||
public string FullUri => _uri;
|
public string FullUri => _uri;
|
||||||
|
|
||||||
|
[GeneratedRegex(@"^(?:(?<scheme>[a-z]+):)?(?://(?<host>[-_A-Z0-9.]+|\[[[A-F0-9:]+\])(?::(?<port>[0-9]{1,5}))?)?(?<path>(?:(?:(?<=^)|/+)[^/?#\r\n]+)+/*|/+)?(?:\?(?<query>[^#\r\n]*))?(?:\#(?<fragment>.*))?$", RegexOptions.IgnoreCase | RegexOptions.Compiled)]
|
||||||
|
private static partial Regex UriRegex();
|
||||||
|
|
||||||
public HttpUri(string uri)
|
public HttpUri(string uri)
|
||||||
{
|
{
|
||||||
_uri = uri ?? string.Empty;
|
_uri = uri ?? string.Empty;
|
||||||
@@ -70,9 +71,9 @@ namespace NzbDrone.Common.Http
|
|||||||
|
|
||||||
private void Parse()
|
private void Parse()
|
||||||
{
|
{
|
||||||
var parseSuccess = Uri.TryCreate(_uri, UriKind.RelativeOrAbsolute, out var uri);
|
var parseSuccess = Uri.TryCreate(_uri, UriKind.RelativeOrAbsolute, out _);
|
||||||
|
|
||||||
var match = RegexUri.Match(_uri);
|
var match = UriRegex().Match(_uri);
|
||||||
|
|
||||||
var scheme = match.Groups["scheme"];
|
var scheme = match.Groups["scheme"];
|
||||||
var host = match.Groups["host"];
|
var host = match.Groups["host"];
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ using NzbDrone.Common.Instrumentation;
|
|||||||
namespace NzbDrone.Core.Datastore.Migration
|
namespace NzbDrone.Core.Datastore.Migration
|
||||||
{
|
{
|
||||||
[Maintenance(MigrationStage.BeforeAll, TransactionBehavior.None)]
|
[Maintenance(MigrationStage.BeforeAll, TransactionBehavior.None)]
|
||||||
public class DatabaseEngineVersionCheck : FluentMigrator.Migration
|
public class DatabaseEngineVersionCheck : ForwardOnlyMigration
|
||||||
{
|
{
|
||||||
protected readonly Logger _logger;
|
protected readonly Logger _logger;
|
||||||
|
|
||||||
@@ -22,11 +22,6 @@ namespace NzbDrone.Core.Datastore.Migration
|
|||||||
IfDatabase("postgres").Execute.WithConnection(LogPostgresVersion);
|
IfDatabase("postgres").Execute.WithConnection(LogPostgresVersion);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Down()
|
|
||||||
{
|
|
||||||
// No-op
|
|
||||||
}
|
|
||||||
|
|
||||||
private void LogSqliteVersion(IDbConnection conn, IDbTransaction tran)
|
private void LogSqliteVersion(IDbConnection conn, IDbTransaction tran)
|
||||||
{
|
{
|
||||||
using (var versionCmd = conn.CreateCommand())
|
using (var versionCmd = conn.CreateCommand())
|
||||||
|
|||||||
@@ -6,7 +6,6 @@ using FluentMigrator.Runner.Generators;
|
|||||||
using FluentMigrator.Runner.Initialization;
|
using FluentMigrator.Runner.Initialization;
|
||||||
using FluentMigrator.Runner.Processors;
|
using FluentMigrator.Runner.Processors;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using NLog;
|
using NLog;
|
||||||
using NLog.Extensions.Logging;
|
using NLog.Extensions.Logging;
|
||||||
|
|
||||||
@@ -20,13 +19,10 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
|||||||
public class MigrationController : IMigrationController
|
public class MigrationController : IMigrationController
|
||||||
{
|
{
|
||||||
private readonly Logger _logger;
|
private readonly Logger _logger;
|
||||||
private readonly ILoggerProvider _migrationLoggerProvider;
|
|
||||||
|
|
||||||
public MigrationController(Logger logger,
|
public MigrationController(Logger logger)
|
||||||
ILoggerProvider migrationLoggerProvider)
|
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_migrationLoggerProvider = migrationLoggerProvider;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Migrate(string connectionString, MigrationContext migrationContext, DatabaseType databaseType)
|
public void Migrate(string connectionString, MigrationContext migrationContext, DatabaseType databaseType)
|
||||||
@@ -35,16 +31,13 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
|||||||
|
|
||||||
_logger.Info("*** Migrating {0} ***", connectionString);
|
_logger.Info("*** Migrating {0} ***", connectionString);
|
||||||
|
|
||||||
ServiceProvider serviceProvider;
|
|
||||||
|
|
||||||
var db = databaseType == DatabaseType.SQLite ? "sqlite" : "postgres";
|
var db = databaseType == DatabaseType.SQLite ? "sqlite" : "postgres";
|
||||||
|
|
||||||
serviceProvider = new ServiceCollection()
|
var serviceProvider = new ServiceCollection()
|
||||||
.AddLogging(b => b.AddNLog())
|
.AddLogging(b => b.AddNLog())
|
||||||
.AddFluentMigratorCore()
|
.AddFluentMigratorCore()
|
||||||
.Configure<RunnerOptions>(cfg => cfg.IncludeUntaggedMaintenances = true)
|
.Configure<RunnerOptions>(cfg => cfg.IncludeUntaggedMaintenances = true)
|
||||||
.ConfigureRunner(
|
.ConfigureRunner(builder => builder
|
||||||
builder => builder
|
|
||||||
.AddPostgres()
|
.AddPostgres()
|
||||||
.AddNzbDroneSQLite()
|
.AddNzbDroneSQLite()
|
||||||
.WithGlobalConnectionString(connectionString)
|
.WithGlobalConnectionString(connectionString)
|
||||||
|
|||||||
@@ -1,11 +1,17 @@
|
|||||||
using FluentMigrator;
|
using System.Data;
|
||||||
|
using FluentMigrator;
|
||||||
using FluentMigrator.Builders.Create;
|
using FluentMigrator.Builders.Create;
|
||||||
using FluentMigrator.Builders.Create.Table;
|
using FluentMigrator.Builders.Create.Table;
|
||||||
using FluentMigrator.Runner;
|
using FluentMigrator.Runner;
|
||||||
using FluentMigrator.Runner.BatchParser;
|
using FluentMigrator.Runner.BatchParser;
|
||||||
|
using FluentMigrator.Runner.Generators;
|
||||||
using FluentMigrator.Runner.Generators.SQLite;
|
using FluentMigrator.Runner.Generators.SQLite;
|
||||||
|
using FluentMigrator.Runner.Initialization;
|
||||||
|
using FluentMigrator.Runner.Processors;
|
||||||
using FluentMigrator.Runner.Processors.SQLite;
|
using FluentMigrator.Runner.Processors.SQLite;
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
|
using Microsoft.Extensions.Logging;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
namespace NzbDrone.Core.Datastore.Migration.Framework
|
namespace NzbDrone.Core.Datastore.Migration.Framework
|
||||||
{
|
{
|
||||||
@@ -16,23 +22,49 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
|||||||
return expressionRoot.Table(name).WithColumn("Id").AsInt32().PrimaryKey().Identity();
|
return expressionRoot.Table(name).WithColumn("Id").AsInt32().PrimaryKey().Identity();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void AddParameter(this System.Data.IDbCommand command, object value)
|
public static IDbCommand CreateCommand(this IDbConnection conn, IDbTransaction tran, string query)
|
||||||
|
{
|
||||||
|
var command = conn.CreateCommand();
|
||||||
|
command.Transaction = tran;
|
||||||
|
command.CommandText = query;
|
||||||
|
|
||||||
|
return command;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void AddParameter(this IDbCommand command, object value)
|
||||||
{
|
{
|
||||||
var parameter = command.CreateParameter();
|
var parameter = command.CreateParameter();
|
||||||
parameter.Value = value;
|
parameter.Value = value;
|
||||||
command.Parameters.Add(parameter);
|
command.Parameters.Add(parameter);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static IMigrationRunnerBuilder AddNzbDroneSQLite(this IMigrationRunnerBuilder builder)
|
public static IMigrationRunnerBuilder AddNzbDroneSQLite(this IMigrationRunnerBuilder builder, bool binaryGuid = false, bool useStrictTables = false)
|
||||||
{
|
{
|
||||||
builder.Services
|
builder.Services
|
||||||
.AddTransient<SQLiteBatchParser>()
|
.AddTransient<SQLiteBatchParser>()
|
||||||
.AddScoped<SQLiteDbFactory>()
|
.AddScoped<SQLiteDbFactory>()
|
||||||
.AddScoped<NzbDroneSQLiteProcessor>()
|
.AddScoped<NzbDroneSQLiteProcessor>(sp =>
|
||||||
|
{
|
||||||
|
var factory = sp.GetService<SQLiteDbFactory>();
|
||||||
|
var logger = sp.GetService<ILogger<NzbDroneSQLiteProcessor>>();
|
||||||
|
var options = sp.GetService<IOptionsSnapshot<ProcessorOptions>>();
|
||||||
|
var connectionStringAccessor = sp.GetService<IConnectionStringAccessor>();
|
||||||
|
var sqliteQuoter = new SQLiteQuoter(false);
|
||||||
|
return new NzbDroneSQLiteProcessor(factory, sp.GetService<SQLiteGenerator>(), logger, options, connectionStringAccessor, sp, sqliteQuoter);
|
||||||
|
})
|
||||||
|
.AddScoped<ISQLiteTypeMap>(_ => new NzbDroneSQLiteTypeMap(useStrictTables))
|
||||||
.AddScoped<IMigrationProcessor>(sp => sp.GetRequiredService<NzbDroneSQLiteProcessor>())
|
.AddScoped<IMigrationProcessor>(sp => sp.GetRequiredService<NzbDroneSQLiteProcessor>())
|
||||||
.AddScoped<SQLiteQuoter>()
|
.AddScoped(
|
||||||
.AddScoped<SQLiteGenerator>()
|
sp =>
|
||||||
|
{
|
||||||
|
var typeMap = sp.GetRequiredService<ISQLiteTypeMap>();
|
||||||
|
return new SQLiteGenerator(
|
||||||
|
new SQLiteQuoter(binaryGuid),
|
||||||
|
typeMap,
|
||||||
|
new OptionsWrapper<GeneratorOptions>(new GeneratorOptions()));
|
||||||
|
})
|
||||||
.AddScoped<IMigrationGenerator>(sp => sp.GetRequiredService<SQLiteGenerator>());
|
.AddScoped<IMigrationGenerator>(sp => sp.GetRequiredService<SQLiteGenerator>());
|
||||||
|
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
|||||||
{
|
{
|
||||||
public class NzbDroneSQLiteProcessor : SQLiteProcessor
|
public class NzbDroneSQLiteProcessor : SQLiteProcessor
|
||||||
{
|
{
|
||||||
|
private readonly SQLiteQuoter _quoter;
|
||||||
|
|
||||||
public NzbDroneSQLiteProcessor(SQLiteDbFactory factory,
|
public NzbDroneSQLiteProcessor(SQLiteDbFactory factory,
|
||||||
SQLiteGenerator generator,
|
SQLiteGenerator generator,
|
||||||
ILogger<NzbDroneSQLiteProcessor> logger,
|
ILogger<NzbDroneSQLiteProcessor> logger,
|
||||||
@@ -24,6 +26,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
|||||||
SQLiteQuoter quoter)
|
SQLiteQuoter quoter)
|
||||||
: base(factory, generator, logger, options, connectionStringAccessor, serviceProvider, quoter)
|
: base(factory, generator, logger, options, connectionStringAccessor, serviceProvider, quoter)
|
||||||
{
|
{
|
||||||
|
_quoter = quoter;
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void Process(AlterColumnExpression expression)
|
public override void Process(AlterColumnExpression expression)
|
||||||
@@ -35,7 +38,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
|||||||
|
|
||||||
if (columnIndex == -1)
|
if (columnIndex == -1)
|
||||||
{
|
{
|
||||||
throw new ApplicationException(string.Format("Column {0} does not exist on table {1}.", expression.Column.Name, expression.TableName));
|
throw new ApplicationException($"Column {expression.Column.Name} does not exist on table {expression.TableName}.");
|
||||||
}
|
}
|
||||||
|
|
||||||
columnDefinitions[columnIndex] = expression.Column;
|
columnDefinitions[columnIndex] = expression.Column;
|
||||||
@@ -45,6 +48,28 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
|||||||
ProcessAlterTable(tableDefinition);
|
ProcessAlterTable(tableDefinition);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override void Process(AlterDefaultConstraintExpression expression)
|
||||||
|
{
|
||||||
|
var tableDefinition = GetTableSchema(expression.TableName);
|
||||||
|
|
||||||
|
var columnDefinitions = tableDefinition.Columns.ToList();
|
||||||
|
var columnIndex = columnDefinitions.FindIndex(c => c.Name == expression.ColumnName);
|
||||||
|
|
||||||
|
if (columnIndex == -1)
|
||||||
|
{
|
||||||
|
throw new ApplicationException($"Column {expression.ColumnName} does not exist on table {expression.TableName}.");
|
||||||
|
}
|
||||||
|
|
||||||
|
var changedColumn = columnDefinitions[columnIndex];
|
||||||
|
changedColumn.DefaultValue = expression.DefaultValue;
|
||||||
|
|
||||||
|
columnDefinitions[columnIndex] = changedColumn;
|
||||||
|
|
||||||
|
tableDefinition.Columns = columnDefinitions;
|
||||||
|
|
||||||
|
ProcessAlterTable(tableDefinition);
|
||||||
|
}
|
||||||
|
|
||||||
public override void Process(DeleteColumnExpression expression)
|
public override void Process(DeleteColumnExpression expression)
|
||||||
{
|
{
|
||||||
var tableDefinition = GetTableSchema(expression.TableName);
|
var tableDefinition = GetTableSchema(expression.TableName);
|
||||||
@@ -62,7 +87,7 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
|||||||
|
|
||||||
if (columnsToRemove.Any())
|
if (columnsToRemove.Any())
|
||||||
{
|
{
|
||||||
throw new ApplicationException(string.Format("Column {0} does not exist on table {1}.", columnsToRemove.First(), expression.TableName));
|
throw new ApplicationException($"Column {columnsToRemove.First()} does not exist on table {expression.TableName}.");
|
||||||
}
|
}
|
||||||
|
|
||||||
ProcessAlterTable(tableDefinition);
|
ProcessAlterTable(tableDefinition);
|
||||||
@@ -78,12 +103,12 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
|||||||
|
|
||||||
if (columnIndex == -1)
|
if (columnIndex == -1)
|
||||||
{
|
{
|
||||||
throw new ApplicationException(string.Format("Column {0} does not exist on table {1}.", expression.OldName, expression.TableName));
|
throw new ApplicationException($"Column {expression.OldName} does not exist on table {expression.TableName}.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (columnDefinitions.Any(c => c.Name == expression.NewName))
|
if (columnDefinitions.Any(c => c.Name == expression.NewName))
|
||||||
{
|
{
|
||||||
throw new ApplicationException(string.Format("Column {0} already exists on table {1}.", expression.NewName, expression.TableName));
|
throw new ApplicationException($"Column {expression.NewName} already exists on table {expression.TableName}.");
|
||||||
}
|
}
|
||||||
|
|
||||||
oldColumnDefinitions[columnIndex] = (ColumnDefinition)columnDefinitions[columnIndex].Clone();
|
oldColumnDefinitions[columnIndex] = (ColumnDefinition)columnDefinitions[columnIndex].Clone();
|
||||||
@@ -128,21 +153,20 @@ namespace NzbDrone.Core.Datastore.Migration.Framework
|
|||||||
}
|
}
|
||||||
|
|
||||||
// What is the cleanest way to do this? Add function to Generator?
|
// What is the cleanest way to do this? Add function to Generator?
|
||||||
var quoter = new SQLiteQuoter();
|
var columnsToInsert = string.Join(", ", tableDefinition.Columns.Select(c => _quoter.QuoteColumnName(c.Name)));
|
||||||
var columnsToInsert = string.Join(", ", tableDefinition.Columns.Select(c => quoter.QuoteColumnName(c.Name)));
|
var columnsToFetch = string.Join(", ", (oldColumnDefinitions ?? tableDefinition.Columns).Select(c => _quoter.QuoteColumnName(c.Name)));
|
||||||
var columnsToFetch = string.Join(", ", (oldColumnDefinitions ?? tableDefinition.Columns).Select(c => quoter.QuoteColumnName(c.Name)));
|
|
||||||
|
|
||||||
Process(new CreateTableExpression() { TableName = tempTableName, Columns = tableDefinition.Columns.ToList() });
|
Process(new CreateTableExpression { TableName = tempTableName, Columns = tableDefinition.Columns.ToList() });
|
||||||
|
|
||||||
Process(string.Format("INSERT INTO {0} ({1}) SELECT {2} FROM {3}", quoter.QuoteTableName(tempTableName), columnsToInsert, columnsToFetch, quoter.QuoteTableName(tableName)));
|
Process($"INSERT INTO {_quoter.QuoteTableName(tempTableName)} ({columnsToInsert}) SELECT {columnsToFetch} FROM {_quoter.QuoteTableName(tableName)}");
|
||||||
|
|
||||||
Process(new DeleteTableExpression() { TableName = tableName });
|
Process(new DeleteTableExpression { TableName = tableName });
|
||||||
|
|
||||||
Process(new RenameTableExpression() { OldName = tempTableName, NewName = tableName });
|
Process(new RenameTableExpression { OldName = tempTableName, NewName = tableName });
|
||||||
|
|
||||||
foreach (var index in tableDefinition.Indexes)
|
foreach (var index in tableDefinition.Indexes)
|
||||||
{
|
{
|
||||||
Process(new CreateIndexExpression() { Index = index });
|
Process(new CreateIndexExpression { Index = index });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
using System.Data;
|
||||||
|
using FluentMigrator.Runner.Generators.Base;
|
||||||
|
using FluentMigrator.Runner.Generators.SQLite;
|
||||||
|
|
||||||
|
namespace NzbDrone.Core.Datastore.Migration.Framework;
|
||||||
|
|
||||||
|
// Based on https://github.com/fluentmigrator/fluentmigrator/blob/v6.2.0/src/FluentMigrator.Runner.SQLite/Generators/SQLite/SQLiteTypeMap.cs
|
||||||
|
public sealed class NzbDroneSQLiteTypeMap : TypeMapBase, ISQLiteTypeMap
|
||||||
|
{
|
||||||
|
public bool UseStrictTables { get; }
|
||||||
|
|
||||||
|
public NzbDroneSQLiteTypeMap(bool useStrictTables = false)
|
||||||
|
{
|
||||||
|
UseStrictTables = useStrictTables;
|
||||||
|
|
||||||
|
SetupTypeMaps();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Must be kept in sync with upstream
|
||||||
|
protected override void SetupTypeMaps()
|
||||||
|
{
|
||||||
|
SetTypeMap(DbType.Binary, "BLOB");
|
||||||
|
SetTypeMap(DbType.Byte, "INTEGER");
|
||||||
|
SetTypeMap(DbType.Int16, "INTEGER");
|
||||||
|
SetTypeMap(DbType.Int32, "INTEGER");
|
||||||
|
SetTypeMap(DbType.Int64, "INTEGER");
|
||||||
|
SetTypeMap(DbType.SByte, "INTEGER");
|
||||||
|
SetTypeMap(DbType.UInt16, "INTEGER");
|
||||||
|
SetTypeMap(DbType.UInt32, "INTEGER");
|
||||||
|
SetTypeMap(DbType.UInt64, "INTEGER");
|
||||||
|
|
||||||
|
if (!UseStrictTables)
|
||||||
|
{
|
||||||
|
SetTypeMap(DbType.Currency, "NUMERIC");
|
||||||
|
SetTypeMap(DbType.Decimal, "NUMERIC");
|
||||||
|
SetTypeMap(DbType.Double, "NUMERIC");
|
||||||
|
SetTypeMap(DbType.Single, "NUMERIC");
|
||||||
|
SetTypeMap(DbType.VarNumeric, "NUMERIC");
|
||||||
|
SetTypeMap(DbType.Date, "DATETIME");
|
||||||
|
SetTypeMap(DbType.DateTime, "DATETIME");
|
||||||
|
SetTypeMap(DbType.DateTime2, "DATETIME");
|
||||||
|
SetTypeMap(DbType.Time, "DATETIME");
|
||||||
|
SetTypeMap(DbType.Guid, "UNIQUEIDENTIFIER");
|
||||||
|
|
||||||
|
// Custom so that we can use DateTimeOffset in Postgres for appropriate DB typing
|
||||||
|
SetTypeMap(DbType.DateTimeOffset, "DATETIME");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SetTypeMap(DbType.Currency, "TEXT");
|
||||||
|
SetTypeMap(DbType.Decimal, "TEXT");
|
||||||
|
SetTypeMap(DbType.Double, "REAL");
|
||||||
|
SetTypeMap(DbType.Single, "REAL");
|
||||||
|
SetTypeMap(DbType.VarNumeric, "TEXT");
|
||||||
|
SetTypeMap(DbType.Date, "TEXT");
|
||||||
|
SetTypeMap(DbType.DateTime, "TEXT");
|
||||||
|
SetTypeMap(DbType.DateTime2, "TEXT");
|
||||||
|
SetTypeMap(DbType.Time, "TEXT");
|
||||||
|
SetTypeMap(DbType.Guid, "TEXT");
|
||||||
|
|
||||||
|
// Custom so that we can use DateTimeOffset in Postgres for appropriate DB typing
|
||||||
|
SetTypeMap(DbType.DateTimeOffset, "TEXT");
|
||||||
|
}
|
||||||
|
|
||||||
|
SetTypeMap(DbType.AnsiString, "TEXT");
|
||||||
|
SetTypeMap(DbType.String, "TEXT");
|
||||||
|
SetTypeMap(DbType.AnsiStringFixedLength, "TEXT");
|
||||||
|
SetTypeMap(DbType.StringFixedLength, "TEXT");
|
||||||
|
SetTypeMap(DbType.Boolean, "INTEGER");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override string GetTypeMap(DbType type, int? size, int? precision)
|
||||||
|
{
|
||||||
|
return base.GetTypeMap(type, size: null, precision: null);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -168,7 +168,7 @@
|
|||||||
"GeneralSettings": "通用设置",
|
"GeneralSettings": "通用设置",
|
||||||
"GeneralSettingsSummary": "端口、SSL、用户名/密码、代理、分析、更新",
|
"GeneralSettingsSummary": "端口、SSL、用户名/密码、代理、分析、更新",
|
||||||
"Genre": "类型",
|
"Genre": "类型",
|
||||||
"GrabReleases": "抓取版本",
|
"GrabReleases": "抓取资源",
|
||||||
"GrabTitle": "抓取标题",
|
"GrabTitle": "抓取标题",
|
||||||
"Grabbed": "已抓取",
|
"Grabbed": "已抓取",
|
||||||
"Grabs": "抓取",
|
"Grabs": "抓取",
|
||||||
@@ -621,7 +621,7 @@
|
|||||||
"DownloadClientFreeboxSettingsAppToken": "App Token",
|
"DownloadClientFreeboxSettingsAppToken": "App Token",
|
||||||
"DownloadClientFreeboxSettingsAppTokenHelpText": "创建访问 Freebox API 所需的 App token(即 “ app_token”)",
|
"DownloadClientFreeboxSettingsAppTokenHelpText": "创建访问 Freebox API 所需的 App token(即 “ app_token”)",
|
||||||
"DownloadClientQbittorrentSettingsInitialStateHelpText": "添加到 qBittorrent 的种子的初始状态。 请注意,强制做种不遵守种子限制",
|
"DownloadClientQbittorrentSettingsInitialStateHelpText": "添加到 qBittorrent 的种子的初始状态。 请注意,强制做种不遵守种子限制",
|
||||||
"GrabRelease": "抓取版本",
|
"GrabRelease": "抓取资源",
|
||||||
"ManualGrab": "手动抓取",
|
"ManualGrab": "手动抓取",
|
||||||
"OverrideAndAddToDownloadClient": "覆盖并添加到下载队列",
|
"OverrideAndAddToDownloadClient": "覆盖并添加到下载队列",
|
||||||
"OverrideGrabModalTitle": "覆盖并抓取 - {title}",
|
"OverrideGrabModalTitle": "覆盖并抓取 - {title}",
|
||||||
@@ -755,7 +755,7 @@
|
|||||||
"IndexerFileListSettingsFreeleechOnlyHelpText": "只搜索免费发布",
|
"IndexerFileListSettingsFreeleechOnlyHelpText": "只搜索免费发布",
|
||||||
"IndexerFileListSettingsUsernameHelpText": "网站用户名",
|
"IndexerFileListSettingsUsernameHelpText": "网站用户名",
|
||||||
"IndexerBeyondHDSettingsRefundOnlyHelpText": "Search refund only",
|
"IndexerBeyondHDSettingsRefundOnlyHelpText": "Search refund only",
|
||||||
"DownloadClientUTorrentProviderMessage": "由于uTorrent以加密软件、恶意软件和广告而闻名,我们建议切换到更好的客户端,例如qBittorrent、Deluge或ruTorrent。",
|
"DownloadClientUTorrentProviderMessage": "uTorrent 曾经含有挖矿行为、恶意软件和广告,我们强烈建议你选择其他客户端。",
|
||||||
"IndexerId": "索引器",
|
"IndexerId": "索引器",
|
||||||
"IndexerSettingsPasskey": "通行密钥",
|
"IndexerSettingsPasskey": "通行密钥",
|
||||||
"IndexerBeyondHDSettingsRefundOnly": "只读",
|
"IndexerBeyondHDSettingsRefundOnly": "只读",
|
||||||
@@ -763,5 +763,45 @@
|
|||||||
"IndexerBeyondHDSettingsRssKeyHelpText": "来自网站的API密钥(在我的安全 => API密钥)",
|
"IndexerBeyondHDSettingsRssKeyHelpText": "来自网站的API密钥(在我的安全 => API密钥)",
|
||||||
"IndexerHDBitsSettingsFreeleechOnlyHelpText": "只搜索免费发布",
|
"IndexerHDBitsSettingsFreeleechOnlyHelpText": "只搜索免费发布",
|
||||||
"IndexerHDBitsSettingsOrigins": "原始",
|
"IndexerHDBitsSettingsOrigins": "原始",
|
||||||
"IndexerPassThePopcornSettingsApiUserHelpText": "这些设置位于 PassThePopcorn 安全设置中(编辑个人资料 > 安全,Edit Profile > Security)。"
|
"IndexerPassThePopcornSettingsApiUserHelpText": "这些设置位于 PassThePopcorn 安全设置中(编辑个人资料 > 安全,Edit Profile > Security)。",
|
||||||
|
"IndexerBeyondHDSettingsSearchTypesHelpText": "选择你感兴趣的版本类型。若无则使用所有可选项。",
|
||||||
|
"IndexerFileListSettingsPasskeyHelpText": "网站密钥(下载客户端中跟踪器链接显示的由字母和数字构成的字符串)",
|
||||||
|
"IndexerGazelleGamesSettingsApiKeyHelpText": "来自网站的 API 密钥(在设置 => 访问设置中)",
|
||||||
|
"IndexerGazelleGamesSettingsApiKeyHelpTextWarning": "必须具有用户和种子权限",
|
||||||
|
"IndexerGazelleGamesSettingsSearchGroupNames": "搜索群组名",
|
||||||
|
"IndexerGazelleGamesSettingsSearchGroupNamesHelpText": "根据群组名搜索版本",
|
||||||
|
"IndexerHDBitsSettingsPasskeyHelpText": "用户详情中的密钥",
|
||||||
|
"IndexerHDBitsSettingsUseFilenames": "使用文件名",
|
||||||
|
"IndexerHDBitsSettingsUseFilenamesHelpText": "勾选此选项如果你想将种子文件名作为发布资源的标题",
|
||||||
|
"IndexerIPTorrentsSettingsCookieUserAgentHelpText": "浏览器中 cookie 所关联的 User-Agent",
|
||||||
|
"IndexerMTeamTpSettingsApiKeyHelpText": "站点中的 API 密钥(在用户控制面板 => 安全 => 实验室中)",
|
||||||
|
"IndexerNebulanceSettingsApiKeyHelpText": "在用户设置 > API 密钥中的API 密钥。密钥必须有列出和下载的权限",
|
||||||
|
"IndexerNewznabSettingsApiKeyHelpText": "站点 API 密钥",
|
||||||
|
"IndexerSettingsCookieHelpText": "站点 Cookie",
|
||||||
|
"IndexerSettingsFreeleechOnly": "仅免流资源",
|
||||||
|
"IndexerSettingsGrabLimit": "抓取上限",
|
||||||
|
"IndexerSettingsGrabLimitHelpText": "在该时间单位内,{appName} 对此站点所允许的最大抓取数",
|
||||||
|
"IndexerSettingsLimitsUnit": "限制单位",
|
||||||
|
"IndexerSettingsLimitsUnitHelpText": "每个索引器计算上限的时间单位",
|
||||||
|
"IndexerSettingsPreferMagnetUrl": "磁力链接优先",
|
||||||
|
"IndexerSettingsPreferMagnetUrlHelpText": "若开启,该索引器将优先使用磁力链接抓取,而种子链接作为备用",
|
||||||
|
"IndexerSettingsQueryLimit": "请求上限",
|
||||||
|
"IndexerSettingsQueryLimitHelpText": "在该时间单位内,{appName} 对此站点所允许的最大请求数",
|
||||||
|
"IndexerIPTorrentsSettingsCookieUserAgent": "Cookie User-Agent",
|
||||||
|
"IndexerNewznabSettingsVipExpirationHelpText": "输入 VIP 到期日期 (yyyy-mm-dd) 或留空,{appName} 将在到期前 1 星期发送通知",
|
||||||
|
"IndexerNzbIndexSettingsApiKeyHelpText": "站点 API 密钥",
|
||||||
|
"IndexerOrpheusSettingsApiKeyHelpText": "站点 API 密钥(在设置 => 访问设置中)",
|
||||||
|
"IndexerPassThePopcornSettingsApiKeyHelpText": "站点 API 密钥",
|
||||||
|
"IndexerPassThePopcornSettingsGoldenPopcornOnly": "仅 Golden Popcorn",
|
||||||
|
"IndexerPassThePopcornSettingsGoldenPopcornOnlyHelpText": "仅搜索 Golden Popcorn 发布的资源",
|
||||||
|
"IndexerRedactedSettingsApiKeyHelpText": "站点 API 密钥(在设置 => 访问设置中)",
|
||||||
|
"IndexerSettingsBaseUrl": "基础链接",
|
||||||
|
"IndexerSettingsBaseUrlHelpText": "选择 {appName} 请求该站点所使用的基础链接",
|
||||||
|
"IndexerTorrentSyndikatSettingsApiKeyHelpText": "站点 API 密钥",
|
||||||
|
"NoApplicationsFound": "找不到程序",
|
||||||
|
"Open": "打开",
|
||||||
|
"PreferMagnetUrl": "磁力链接优先",
|
||||||
|
"PreferMagnetUrlHelpText": "若开启,该索引器将优先使用磁力链接,种子链接作为备用",
|
||||||
|
"ProwlarrDownloadClientsAlert": "如果你想直接在 {appName} 中搜索,你需要添加下载管理器,否则你不需要在此添加。你的程序中的搜索行为将使用它自己的下载管理器配置。",
|
||||||
|
"ProwlarrDownloadClientsInAppOnlyAlert": "下载管理器仅对 {appName} 中搜索有效,而不会同步到其他程序中。目前没有添加此功能的计划。"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,9 +13,9 @@
|
|||||||
<PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
|
<PackageReference Include="NLog.Targets.Syslog" Version="7.0.0" />
|
||||||
<PackageReference Include="Npgsql" Version="9.0.3" />
|
<PackageReference Include="Npgsql" Version="9.0.3" />
|
||||||
<PackageReference Include="Polly" Version="8.6.4" />
|
<PackageReference Include="Polly" Version="8.6.4" />
|
||||||
<PackageReference Include="Servarr.FluentMigrator.Runner" Version="3.3.2.9" />
|
<PackageReference Include="FluentMigrator.Runner.Core" Version="6.2.0" />
|
||||||
<PackageReference Include="Servarr.FluentMigrator.Runner.Postgres" Version="3.3.2.9" />
|
<PackageReference Include="FluentMigrator.Runner.Postgres" Version="6.2.0" />
|
||||||
<PackageReference Include="Servarr.FluentMigrator.Runner.SQLite" Version="3.3.2.9" />
|
<PackageReference Include="FluentMigrator.Runner.SQLite" Version="6.2.0" />
|
||||||
<PackageReference Include="System.Drawing.Common" Version="8.0.19" />
|
<PackageReference Include="System.Drawing.Common" Version="8.0.19" />
|
||||||
<PackageReference Include="System.Memory" Version="4.6.3" />
|
<PackageReference Include="System.Memory" Version="4.6.3" />
|
||||||
<PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
|
<PackageReference Include="System.ServiceModel.Syndication" Version="8.0.0" />
|
||||||
|
|||||||
Reference in New Issue
Block a user