alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-24 19:14:56 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

fixes #1404 - [BUG] Emby recreating old folder name after renaming/moving folder

Browse Source
This commit is contained in:
Luke Pulverenti
2016-03-24 02:04:58 -04:00
parent 32b5ef7b80
commit 5d0abc280d
8 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Server.Implementations/Channels/ChannelManager.cs
View File

@@ -561,8 +561,7 @@ namespace MediaBrowser.Server.Implementations.Channels
{
throw new ArgumentNullException("name");
}
return ("Channel " + name).GetMBId(typeof(Channel));
return _libraryManager.GetNewItemId("Channel " + name, typeof(Channel));
}
public async Task<QueryResult<BaseItemDto>> GetLatestChannelItems(AllChannelMediaQuery query, CancellationToken cancellationToken)

7
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@@ -508,7 +508,12 @@ namespace MediaBrowser.Server.Implementations.Library
.Replace("/", "\\");
}
key = type.FullName + key.ToLower();
if (!ConfigurationManager.Configuration.EnableCaseSensitiveItemIds)
{
key = key.ToLower();
}
key = type.FullName + key;
return key.GetMD5();
}

10
MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
View File

@@ -25,14 +25,16 @@ namespace MediaBrowser.Server.Implementations.LiveTv
private readonly IUserDataManager _userDataManager;
private readonly IDtoService _dtoService;
private readonly IApplicationHost _appHost;
private readonly ILibraryManager _libraryManager;
public LiveTvDtoService(IDtoService dtoService, IUserDataManager userDataManager, IImageProcessor imageProcessor, ILogger logger, IApplicationHost appHost)
public LiveTvDtoService(IDtoService dtoService, IUserDataManager userDataManager, IImageProcessor imageProcessor, ILogger logger, IApplicationHost appHost, ILibraryManager libraryManager)
{
_dtoService = dtoService;
_userDataManager = userDataManager;
_imageProcessor = imageProcessor;
_logger = logger;
_appHost = appHost;
_libraryManager = libraryManager;
}
public TimerInfoDto GetTimerInfoDto(TimerInfo info, ILiveTvService service, LiveTvProgram program, LiveTvChannel channel)
@@ -200,7 +202,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
{
var name = serviceName + externalId + InternalVersionNumber;
return name.ToLower().GetMBId(typeof(LiveTvChannel));
return _libraryManager.GetNewItemId(name.ToLower(), typeof(LiveTvChannel));
}
public Guid GetInternalTimerId(string serviceName, string externalId)
@@ -221,14 +223,14 @@ namespace MediaBrowser.Server.Implementations.LiveTv
{
var name = serviceName + externalId + InternalVersionNumber;
return name.ToLower().GetMBId(typeof(LiveTvProgram));
return _libraryManager.GetNewItemId(name.ToLower(), typeof(LiveTvProgram));
}
public Guid GetInternalRecordingId(string serviceName, string externalId)
{
var name = serviceName + externalId + InternalVersionNumber + "0";
return name.ToLower().GetMBId(typeof(ILiveTvRecording));
return _libraryManager.GetNewItemId(name.ToLower(), typeof(ILiveTvRecording));
}
public async Task<TimerInfo> GetTimerInfo(TimerInfoDto dto, bool isNew, LiveTvManager liveTv, CancellationToken cancellationToken)

2
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View File

@@ -81,7 +81,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
_dtoService = dtoService;
_userDataManager = userDataManager;
_tvDtoService = new LiveTvDtoService(dtoService, userDataManager, imageProcessor, logger, appHost);
_tvDtoService = new LiveTvDtoService(dtoService, userDataManager, imageProcessor, logger, appHost, _libraryManager);
}
/// <summary>