diff options
Diffstat (limited to 'MediaBrowser.Server.Sqlite')
5 files changed, 75 insertions, 14 deletions
diff --git a/MediaBrowser.Server.Sqlite/SQLiteDisplayPreferencesRepository.cs b/MediaBrowser.Server.Sqlite/SQLiteDisplayPreferencesRepository.cs index be45a82dd..4ef4cf086 100644 --- a/MediaBrowser.Server.Sqlite/SQLiteDisplayPreferencesRepository.cs +++ b/MediaBrowser.Server.Sqlite/SQLiteDisplayPreferencesRepository.cs @@ -2,6 +2,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Persistence; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -36,6 +37,16 @@ namespace MediaBrowser.Server.Sqlite } /// <summary> + /// Initializes a new instance of the <see cref="SQLiteUserDataRepository" /> class. + /// </summary> + /// <param name="logger">The logger.</param> + [ImportingConstructor] + protected SQLiteDisplayPreferencesRepository([Import("logger")] ILogger logger) + : base(logger) + { + } + + /// <summary> /// Opens the connection to the database /// </summary> /// <returns>Task.</returns> @@ -75,7 +86,7 @@ namespace MediaBrowser.Server.Sqlite { throw new ArgumentNullException("cancellationToken"); } - + cancellationToken.ThrowIfCancellationRequested(); return Task.Run(() => diff --git a/MediaBrowser.Server.Sqlite/SQLiteItemRepository.cs b/MediaBrowser.Server.Sqlite/SQLiteItemRepository.cs index c381de85b..d00bd63ce 100644 --- a/MediaBrowser.Server.Sqlite/SQLiteItemRepository.cs +++ b/MediaBrowser.Server.Sqlite/SQLiteItemRepository.cs @@ -2,6 +2,7 @@ using MediaBrowser.Common.Serialization; using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Persistence; +using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -41,6 +42,16 @@ namespace MediaBrowser.Server.Sqlite } /// <summary> + /// Initializes a new instance of the <see cref="SQLiteUserDataRepository" /> class. + /// </summary> + /// <param name="logger">The logger.</param> + [ImportingConstructor] + protected SQLiteItemRepository([Import("logger")] ILogger logger) + : base(logger) + { + } + + /// <summary> /// Opens the connection to the database /// </summary> /// <returns>Task.</returns> @@ -106,7 +117,7 @@ namespace MediaBrowser.Server.Sqlite var serialized = JsonSerializer.SerializeToBytes(item); cancellationToken.ThrowIfCancellationRequested(); - + var cmd = connection.CreateCommand(); cmd.CommandText = "replace into items (guid, obj_type, data) values (@1, @2, @3)"; cmd.AddParam("@1", item.Id); @@ -128,7 +139,7 @@ namespace MediaBrowser.Server.Sqlite { throw new ArgumentException(); } - + return RetrieveItemInternal(id); } @@ -144,7 +155,7 @@ namespace MediaBrowser.Server.Sqlite { throw new ArgumentException(); } - + var cmd = connection.CreateCommand(); cmd.CommandText = "select obj_type,data from items where guid = @guid"; var guidParam = cmd.Parameters.Add("@guid", DbType.Guid); @@ -185,7 +196,7 @@ namespace MediaBrowser.Server.Sqlite { throw new ArgumentNullException(); } - + var cmd = connection.CreateCommand(); cmd.CommandText = "select obj_type,data from items where guid in (select child from children where guid = @guid)"; var guidParam = cmd.Parameters.Add("@guid", DbType.Guid); @@ -202,7 +213,7 @@ namespace MediaBrowser.Server.Sqlite var itemType = _typeMapper.GetType(type); if (itemType == null) { - Logger.Error("Cannot find type {0}. Probably belongs to plug-in that is no longer loaded.",type); + Logger.Error("Cannot find type {0}. Probably belongs to plug-in that is no longer loaded.", type); continue; } var item = JsonSerializer.DeserializeFromStream(stream, itemType) as BaseItem; diff --git a/MediaBrowser.Server.Sqlite/SQLiteRepository.cs b/MediaBrowser.Server.Sqlite/SQLiteRepository.cs index b84b336dc..09484d68e 100644 --- a/MediaBrowser.Server.Sqlite/SQLiteRepository.cs +++ b/MediaBrowser.Server.Sqlite/SQLiteRepository.cs @@ -38,14 +38,33 @@ namespace MediaBrowser.Server.Sqlite /// </summary> private Timer FlushTimer; + /// <summary> + /// Gets the logger. + /// </summary> + /// <value>The logger.</value> protected ILogger Logger { get; private set; } /// <summary> + /// Initializes a new instance of the <see cref="SqliteRepository" /> class. + /// </summary> + /// <param name="logger">The logger.</param> + /// <exception cref="System.ArgumentNullException">logger</exception> + protected SqliteRepository(ILogger logger) + { + if (logger == null) + { + throw new ArgumentNullException("logger"); + } + + Logger = logger; + } + + /// <summary> /// Connects to DB. /// </summary> /// <param name="dbPath">The db path.</param> /// <returns>Task{System.Boolean}.</returns> - /// <exception cref="System.ArgumentNullException"></exception> + /// <exception cref="System.ArgumentNullException">dbPath</exception> protected async Task ConnectToDB(string dbPath) { if (string.IsNullOrEmpty(dbPath)) @@ -53,8 +72,6 @@ namespace MediaBrowser.Server.Sqlite throw new ArgumentNullException("dbPath"); } - Logger = LogManager.GetLogger(GetType().Name); - dbFileName = dbPath; var connectionstr = new SQLiteConnectionStringBuilder { @@ -78,7 +95,7 @@ namespace MediaBrowser.Server.Sqlite /// </summary> /// <param name="queries">The queries.</param> /// <returns><c>true</c> if XXXX, <c>false</c> otherwise</returns> - /// <exception cref="System.ArgumentNullException"></exception> + /// <exception cref="System.ArgumentNullException">queries</exception> protected void RunQueries(string[] queries) { if (queries == null) @@ -167,7 +184,7 @@ namespace MediaBrowser.Server.Sqlite /// Queues the command. /// </summary> /// <param name="cmd">The CMD.</param> - /// <exception cref="System.ArgumentNullException"></exception> + /// <exception cref="System.ArgumentNullException">cmd</exception> protected void QueueCommand(SQLiteCommand cmd) { if (cmd == null) @@ -242,7 +259,7 @@ namespace MediaBrowser.Server.Sqlite /// </summary> /// <param name="cmd">The CMD.</param> /// <returns>Task.</returns> - /// <exception cref="System.ArgumentNullException"></exception> + /// <exception cref="System.ArgumentNullException">cmd</exception> public async Task ExecuteCommand(DbCommand cmd) { if (cmd == null) @@ -275,7 +292,7 @@ namespace MediaBrowser.Server.Sqlite /// <param name="reader">The reader.</param> /// <param name="ordinal">The ordinal.</param> /// <returns>Stream.</returns> - /// <exception cref="System.ArgumentNullException"></exception> + /// <exception cref="System.ArgumentNullException">reader</exception> protected static Stream GetStream(IDataReader reader, int ordinal) { if (reader == null) diff --git a/MediaBrowser.Server.Sqlite/SQLiteUserDataRepository.cs b/MediaBrowser.Server.Sqlite/SQLiteUserDataRepository.cs index c9d4db3ba..732ebc06c 100644 --- a/MediaBrowser.Server.Sqlite/SQLiteUserDataRepository.cs +++ b/MediaBrowser.Server.Sqlite/SQLiteUserDataRepository.cs @@ -1,6 +1,7 @@ using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Persistence; +using MediaBrowser.Model.Logging; using System; using System.Collections.Generic; using System.ComponentModel.Composition; @@ -35,6 +36,16 @@ namespace MediaBrowser.Server.Sqlite } /// <summary> + /// Initializes a new instance of the <see cref="SQLiteUserDataRepository" /> class. + /// </summary> + /// <param name="logger">The logger.</param> + [ImportingConstructor] + protected SQLiteUserDataRepository([Import("logger")] ILogger logger) + : base(logger) + { + } + + /// <summary> /// Opens the connection to the database /// </summary> /// <returns>Task.</returns> @@ -108,7 +119,7 @@ namespace MediaBrowser.Server.Sqlite /// </summary> /// <param name="item">The item.</param> /// <returns>IEnumerable{UserItemData}.</returns> - /// <exception cref="System.ArgumentNullException"></exception> + /// <exception cref="System.ArgumentNullException">item</exception> public IEnumerable<UserItemData> RetrieveUserData(BaseItem item) { if (item == null) diff --git a/MediaBrowser.Server.Sqlite/SQLiteUserRepository.cs b/MediaBrowser.Server.Sqlite/SQLiteUserRepository.cs index f300f5177..8788a488f 100644 --- a/MediaBrowser.Server.Sqlite/SQLiteUserRepository.cs +++ b/MediaBrowser.Server.Sqlite/SQLiteUserRepository.cs @@ -9,6 +9,7 @@ using System.Data; using System.IO; using System.Threading; using System.Threading.Tasks; +using MediaBrowser.Model.Logging; namespace MediaBrowser.Server.Sqlite { @@ -36,6 +37,16 @@ namespace MediaBrowser.Server.Sqlite } /// <summary> + /// Initializes a new instance of the <see cref="SQLiteUserDataRepository" /> class. + /// </summary> + /// <param name="logger">The logger.</param> + [ImportingConstructor] + protected SQLiteUserRepository([Import("logger")] ILogger logger) + : base(logger) + { + } + + /// <summary> /// Opens the connection to the database /// </summary> /// <returns>Task.</returns> |