alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-09 20:02:11 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

removed static logger

Browse Source
This commit is contained in:
LukePulverenti
2013-02-21 15:26:35 -05:00
parent 4019b9260b
commit ab1065a567
46 changed files with 424 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
MediaBrowser.Server.Sqlite/SQLiteDisplayPreferencesRepository.cs
View File

@@ -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;
@@ -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 SQLiteDisplayPreferencesRepository([Import("logger")] ILogger logger)
: base(logger)
{
}
/// <summary>
/// Opens the connection to the database
/// </summary>
@@ -75,7 +86,7 @@ namespace MediaBrowser.Server.Sqlite
{
throw new ArgumentNullException("cancellationToken");
}
cancellationToken.ThrowIfCancellationRequested();
return Task.Run(() =>

21
MediaBrowser.Server.Sqlite/SQLiteItemRepository.cs
View File

@@ -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;
@@ -40,6 +41,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>
@@ -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;

31
MediaBrowser.Server.Sqlite/SQLiteRepository.cs
View File

@@ -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)

13
MediaBrowser.Server.Sqlite/SQLiteUserDataRepository.cs
View File

@@ -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;
@@ -34,6 +35,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>
@@ -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)

11
MediaBrowser.Server.Sqlite/SQLiteUserRepository.cs
View File

@@ -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
{
@@ -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 SQLiteUserRepository([Import("logger")] ILogger logger)
: base(logger)
{
}
/// <summary>
/// Opens the connection to the database
/// </summary>