瀏覽代碼

Bump SQLitePCL.pretty.netstandard to 3.0.1

cvium 4 年之前
父節點
當前提交
3b59064f97

+ 2 - 2
Emby.Server.Implementations/Data/ManagedConnection.cs

@@ -54,12 +54,12 @@ namespace Emby.Server.Implementations.Data
             return _db.RunInTransaction(action, mode);
             return _db.RunInTransaction(action, mode);
         }
         }
 
 
-        public IEnumerable<IReadOnlyList<IResultSetValue>> Query(string sql)
+        public IEnumerable<IReadOnlyList<ResultSetValue>> Query(string sql)
         {
         {
             return _db.Query(sql);
             return _db.Query(sql);
         }
         }
 
 
-        public IEnumerable<IReadOnlyList<IResultSetValue>> Query(string sql, params object[] values)
+        public IEnumerable<IReadOnlyList<ResultSetValue>> Query(string sql, params object[] values)
         {
         {
             return _db.Query(sql, values);
             return _db.Query(sql, values);
         }
         }

+ 16 - 17
Emby.Server.Implementations/Data/SqliteExtensions.cs

@@ -4,7 +4,6 @@
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics;
-using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Globalization;
 using SQLitePCL.pretty;
 using SQLitePCL.pretty;
 
 
@@ -66,7 +65,7 @@ namespace Emby.Server.Implementations.Data
             });
             });
         }
         }
 
 
-        public static Guid ReadGuidFromBlob(this IResultSetValue result)
+        public static Guid ReadGuidFromBlob(this ResultSetValue result)
         {
         {
             return new Guid(result.ToBlob());
             return new Guid(result.ToBlob());
         }
         }
@@ -87,7 +86,7 @@ namespace Emby.Server.Implementations.Data
         private static string GetDateTimeKindFormat(DateTimeKind kind)
         private static string GetDateTimeKindFormat(DateTimeKind kind)
             => (kind == DateTimeKind.Utc) ? DatetimeFormatUtc : DatetimeFormatLocal;
             => (kind == DateTimeKind.Utc) ? DatetimeFormatUtc : DatetimeFormatLocal;
 
 
-        public static DateTime ReadDateTime(this IResultSetValue result)
+        public static DateTime ReadDateTime(this ResultSetValue result)
         {
         {
             var dateText = result.ToString();
             var dateText = result.ToString();
 
 
@@ -98,7 +97,7 @@ namespace Emby.Server.Implementations.Data
                 DateTimeStyles.None).ToUniversalTime();
                 DateTimeStyles.None).ToUniversalTime();
         }
         }
 
 
-        public static bool TryReadDateTime(this IReadOnlyList<IResultSetValue> reader, int index, out DateTime result)
+        public static bool TryReadDateTime(this IReadOnlyList<ResultSetValue> reader, int index, out DateTime result)
         {
         {
             var item = reader[index];
             var item = reader[index];
             if (item.IsDbNull())
             if (item.IsDbNull())
@@ -119,7 +118,7 @@ namespace Emby.Server.Implementations.Data
             return false;
             return false;
         }
         }
 
 
-        public static bool TryGetGuid(this IReadOnlyList<IResultSetValue> reader, int index, out Guid result)
+        public static bool TryGetGuid(this IReadOnlyList<ResultSetValue> reader, int index, out Guid result)
         {
         {
             var item = reader[index];
             var item = reader[index];
             if (item.IsDbNull())
             if (item.IsDbNull())
@@ -132,17 +131,17 @@ namespace Emby.Server.Implementations.Data
             return true;
             return true;
         }
         }
 
 
-        public static bool IsDbNull(this IResultSetValue result)
+        public static bool IsDbNull(this ResultSetValue result)
         {
         {
             return result.SQLiteType == SQLiteType.Null;
             return result.SQLiteType == SQLiteType.Null;
         }
         }
 
 
-        public static string GetString(this IReadOnlyList<IResultSetValue> result, int index)
+        public static string GetString(this IReadOnlyList<ResultSetValue> result, int index)
         {
         {
             return result[index].ToString();
             return result[index].ToString();
         }
         }
 
 
-        public static bool TryGetString(this IReadOnlyList<IResultSetValue> reader, int index, out string result)
+        public static bool TryGetString(this IReadOnlyList<ResultSetValue> reader, int index, out string result)
         {
         {
             result = null;
             result = null;
             var item = reader[index];
             var item = reader[index];
@@ -155,12 +154,12 @@ namespace Emby.Server.Implementations.Data
             return true;
             return true;
         }
         }
 
 
-        public static bool GetBoolean(this IReadOnlyList<IResultSetValue> result, int index)
+        public static bool GetBoolean(this IReadOnlyList<ResultSetValue> result, int index)
         {
         {
             return result[index].ToBool();
             return result[index].ToBool();
         }
         }
 
 
-        public static bool TryGetBoolean(this IReadOnlyList<IResultSetValue> reader, int index, out bool result)
+        public static bool TryGetBoolean(this IReadOnlyList<ResultSetValue> reader, int index, out bool result)
         {
         {
             var item = reader[index];
             var item = reader[index];
             if (item.IsDbNull())
             if (item.IsDbNull())
@@ -173,7 +172,7 @@ namespace Emby.Server.Implementations.Data
             return true;
             return true;
         }
         }
 
 
-        public static bool TryGetInt32(this IReadOnlyList<IResultSetValue> reader, int index, out int result)
+        public static bool TryGetInt32(this IReadOnlyList<ResultSetValue> reader, int index, out int result)
         {
         {
             var item = reader[index];
             var item = reader[index];
             if (item.IsDbNull())
             if (item.IsDbNull())
@@ -186,12 +185,12 @@ namespace Emby.Server.Implementations.Data
             return true;
             return true;
         }
         }
 
 
-        public static long GetInt64(this IReadOnlyList<IResultSetValue> result, int index)
+        public static long GetInt64(this IReadOnlyList<ResultSetValue> result, int index)
         {
         {
             return result[index].ToInt64();
             return result[index].ToInt64();
         }
         }
 
 
-        public static bool TryGetInt64(this IReadOnlyList<IResultSetValue> reader, int index, out long result)
+        public static bool TryGetInt64(this IReadOnlyList<ResultSetValue> reader, int index, out long result)
         {
         {
             var item = reader[index];
             var item = reader[index];
             if (item.IsDbNull())
             if (item.IsDbNull())
@@ -204,7 +203,7 @@ namespace Emby.Server.Implementations.Data
             return true;
             return true;
         }
         }
 
 
-        public static bool TryGetSingle(this IReadOnlyList<IResultSetValue> reader, int index, out float result)
+        public static bool TryGetSingle(this IReadOnlyList<ResultSetValue> reader, int index, out float result)
         {
         {
             var item = reader[index];
             var item = reader[index];
             if (item.IsDbNull())
             if (item.IsDbNull())
@@ -217,7 +216,7 @@ namespace Emby.Server.Implementations.Data
             return true;
             return true;
         }
         }
 
 
-        public static bool TryGetDouble(this IReadOnlyList<IResultSetValue> reader, int index, out double result)
+        public static bool TryGetDouble(this IReadOnlyList<ResultSetValue> reader, int index, out double result)
         {
         {
             var item = reader[index];
             var item = reader[index];
             if (item.IsDbNull())
             if (item.IsDbNull())
@@ -230,7 +229,7 @@ namespace Emby.Server.Implementations.Data
             return true;
             return true;
         }
         }
 
 
-        public static Guid GetGuid(this IReadOnlyList<IResultSetValue> result, int index)
+        public static Guid GetGuid(this IReadOnlyList<ResultSetValue> result, int index)
         {
         {
             return result[index].ReadGuidFromBlob();
             return result[index].ReadGuidFromBlob();
         }
         }
@@ -442,7 +441,7 @@ namespace Emby.Server.Implementations.Data
             }
             }
         }
         }
 
 
-        public static IEnumerable<IReadOnlyList<IResultSetValue>> ExecuteQuery(this IStatement statement)
+        public static IEnumerable<IReadOnlyList<ResultSetValue>> ExecuteQuery(this IStatement statement)
         {
         {
             while (statement.MoveNext())
             while (statement.MoveNext())
             {
             {

+ 7 - 7
Emby.Server.Implementations/Data/SqliteItemRepository.cs

@@ -1284,12 +1284,12 @@ namespace Emby.Server.Implementations.Data
             return true;
             return true;
         }
         }
 
 
-        private BaseItem GetItem(IReadOnlyList<IResultSetValue> reader, InternalItemsQuery query)
+        private BaseItem GetItem(IReadOnlyList<ResultSetValue> reader, InternalItemsQuery query)
         {
         {
             return GetItem(reader, query, HasProgramAttributes(query), HasEpisodeAttributes(query), HasServiceName(query), HasStartDate(query), HasTrailerTypes(query), HasArtistFields(query), HasSeriesFields(query));
             return GetItem(reader, query, HasProgramAttributes(query), HasEpisodeAttributes(query), HasServiceName(query), HasStartDate(query), HasTrailerTypes(query), HasArtistFields(query), HasSeriesFields(query));
         }
         }
 
 
-        private BaseItem GetItem(IReadOnlyList<IResultSetValue> reader, InternalItemsQuery query, bool enableProgramAttributes, bool hasEpisodeAttributes, bool hasServiceName, bool queryHasStartDate, bool hasTrailerTypes, bool hasArtistFields, bool hasSeriesFields)
+        private BaseItem GetItem(IReadOnlyList<ResultSetValue> reader, InternalItemsQuery query, bool enableProgramAttributes, bool hasEpisodeAttributes, bool hasServiceName, bool queryHasStartDate, bool hasTrailerTypes, bool hasArtistFields, bool hasSeriesFields)
         {
         {
             var typeString = reader.GetString(0);
             var typeString = reader.GetString(0);
 
 
@@ -1929,7 +1929,7 @@ namespace Emby.Server.Implementations.Data
         /// <param name="reader">The reader.</param>
         /// <param name="reader">The reader.</param>
         /// <param name="item">The item.</param>
         /// <param name="item">The item.</param>
         /// <returns>ChapterInfo.</returns>
         /// <returns>ChapterInfo.</returns>
-        private ChapterInfo GetChapter(IReadOnlyList<IResultSetValue> reader, BaseItem item)
+        private ChapterInfo GetChapter(IReadOnlyList<ResultSetValue> reader, BaseItem item)
         {
         {
             var chapter = new ChapterInfo
             var chapter = new ChapterInfo
             {
             {
@@ -5503,7 +5503,7 @@ AND Type = @InternalPersonType)");
             return result;
             return result;
         }
         }
 
 
-        private static ItemCounts GetItemCounts(IReadOnlyList<IResultSetValue> reader, int countStartColumn, string[] typesToCount)
+        private static ItemCounts GetItemCounts(IReadOnlyList<ResultSetValue> reader, int countStartColumn, string[] typesToCount)
         {
         {
             var counts = new ItemCounts();
             var counts = new ItemCounts();
 
 
@@ -5734,7 +5734,7 @@ AND Type = @InternalPersonType)");
             }
             }
         }
         }
 
 
-        private PersonInfo GetPerson(IReadOnlyList<IResultSetValue> reader)
+        private PersonInfo GetPerson(IReadOnlyList<ResultSetValue> reader)
         {
         {
             var item = new PersonInfo
             var item = new PersonInfo
             {
             {
@@ -5941,7 +5941,7 @@ AND Type = @InternalPersonType)");
         /// </summary>
         /// </summary>
         /// <param name="reader">The reader.</param>
         /// <param name="reader">The reader.</param>
         /// <returns>ChapterInfo.</returns>
         /// <returns>ChapterInfo.</returns>
-        private MediaStream GetMediaStream(IReadOnlyList<IResultSetValue> reader)
+        private MediaStream GetMediaStream(IReadOnlyList<ResultSetValue> reader)
         {
         {
             var item = new MediaStream
             var item = new MediaStream
             {
             {
@@ -6242,7 +6242,7 @@ AND Type = @InternalPersonType)");
         /// </summary>
         /// </summary>
         /// <param name="reader">The reader.</param>
         /// <param name="reader">The reader.</param>
         /// <returns>MediaAttachment.</returns>
         /// <returns>MediaAttachment.</returns>
-        private MediaAttachment GetMediaAttachment(IReadOnlyList<IResultSetValue> reader)
+        private MediaAttachment GetMediaAttachment(IReadOnlyList<ResultSetValue> reader)
         {
         {
             var item = new MediaAttachment
             var item = new MediaAttachment
             {
             {

+ 1 - 1
Emby.Server.Implementations/Data/SqliteUserDataRepository.cs

@@ -350,7 +350,7 @@ namespace Emby.Server.Implementations.Data
         /// Read a row from the specified reader into the provided userData object.
         /// Read a row from the specified reader into the provided userData object.
         /// </summary>
         /// </summary>
         /// <param name="reader"></param>
         /// <param name="reader"></param>
-        private UserItemData ReadRow(IReadOnlyList<IResultSetValue> reader)
+        private UserItemData ReadRow(IReadOnlyList<ResultSetValue> reader)
         {
         {
             var userData = new UserItemData();
             var userData = new UserItemData();
 
 

+ 1 - 1
Emby.Server.Implementations/Emby.Server.Implementations.csproj

@@ -31,7 +31,7 @@
     <PackageReference Include="Mono.Nat" Version="3.0.1" />
     <PackageReference Include="Mono.Nat" Version="3.0.1" />
     <PackageReference Include="prometheus-net.DotNetRuntime" Version="4.1.0" />
     <PackageReference Include="prometheus-net.DotNetRuntime" Version="4.1.0" />
     <PackageReference Include="sharpcompress" Version="0.28.2" />
     <PackageReference Include="sharpcompress" Version="0.28.2" />
-    <PackageReference Include="SQLitePCL.pretty.netstandard" Version="2.2.0" />
+    <PackageReference Include="SQLitePCL.pretty.netstandard" Version="3.0.1" />
     <PackageReference Include="DotNet.Glob" Version="3.1.2" />
     <PackageReference Include="DotNet.Glob" Version="3.1.2" />
   </ItemGroup>
   </ItemGroup>
 
 

+ 1 - 1
Emby.Server.Implementations/Security/AuthenticationRepository.cs

@@ -291,7 +291,7 @@ namespace Emby.Server.Implementations.Security
             return result;
             return result;
         }
         }
 
 
-        private static AuthenticationInfo Get(IReadOnlyList<IResultSetValue> reader)
+        private static AuthenticationInfo Get(IReadOnlyList<ResultSetValue> reader)
         {
         {
             var info = new AuthenticationInfo
             var info = new AuthenticationInfo
             {
             {