mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 11:34:57 +02:00
auto-organize fix
This commit is contained in:
parent
c7353976b9
commit
62db1579c8
4 changed files with 28 additions and 36 deletions
|
@ -8,12 +8,12 @@ using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.MediaEncoding;
|
using MediaBrowser.Controller.MediaEncoding;
|
||||||
using MediaBrowser.Model.Configuration;
|
using MediaBrowser.Model.Configuration;
|
||||||
using MediaBrowser.Model.Dlna;
|
using MediaBrowser.Model.Dlna;
|
||||||
using MediaBrowser.Model.Drawing;
|
|
||||||
using MediaBrowser.Model.Dto;
|
using MediaBrowser.Model.Dto;
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Extensions;
|
using MediaBrowser.Model.Extensions;
|
||||||
using MediaBrowser.Model.IO;
|
using MediaBrowser.Model.IO;
|
||||||
using MediaBrowser.Model.MediaInfo;
|
using MediaBrowser.Model.MediaInfo;
|
||||||
|
using MediaBrowser.Model.Serialization;
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Diagnostics;
|
using System.Diagnostics;
|
||||||
|
@ -23,7 +23,6 @@ using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Model.Serialization;
|
|
||||||
|
|
||||||
namespace MediaBrowser.Api.Playback
|
namespace MediaBrowser.Api.Playback
|
||||||
{
|
{
|
||||||
|
|
|
@ -59,12 +59,19 @@ namespace MediaBrowser.Server.Implementations.FileOrganization
|
||||||
var organizer = new EpisodeFileOrganizer(_organizationService, _config, _fileSystem, _logger, _libraryManager,
|
var organizer = new EpisodeFileOrganizer(_organizationService, _config, _fileSystem, _logger, _libraryManager,
|
||||||
_libraryMonitor, _providerManager);
|
_libraryMonitor, _providerManager);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
var result = await organizer.OrganizeEpisodeFile(file.FullName, options, options.OverwriteExistingEpisodes, cancellationToken).ConfigureAwait(false);
|
var result = await organizer.OrganizeEpisodeFile(file.FullName, options, options.OverwriteExistingEpisodes, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
if (result.Status == FileSortingStatus.Success)
|
if (result.Status == FileSortingStatus.Success)
|
||||||
{
|
{
|
||||||
scanLibrary = true;
|
scanLibrary = true;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.ErrorException("Error organizing episode {0}", ex, file);
|
||||||
|
}
|
||||||
|
|
||||||
numComplete++;
|
numComplete++;
|
||||||
double percent = numComplete;
|
double percent = numComplete;
|
||||||
|
|
|
@ -458,24 +458,14 @@ namespace MediaBrowser.WebDashboard.Api
|
||||||
"thirdparty/apiclient/md5.js",
|
"thirdparty/apiclient/md5.js",
|
||||||
"thirdparty/apiclient/sha1.js",
|
"thirdparty/apiclient/sha1.js",
|
||||||
"thirdparty/apiclient/store.js",
|
"thirdparty/apiclient/store.js",
|
||||||
"thirdparty/apiclient/network.js",
|
|
||||||
"thirdparty/apiclient/device.js",
|
"thirdparty/apiclient/device.js",
|
||||||
"thirdparty/apiclient/credentials.js",
|
"thirdparty/apiclient/credentials.js",
|
||||||
"thirdparty/apiclient/ajax.js",
|
"thirdparty/apiclient/ajax.js",
|
||||||
"thirdparty/apiclient/events.js",
|
"thirdparty/apiclient/events.js",
|
||||||
"thirdparty/apiclient/deferred.js",
|
"thirdparty/apiclient/deferred.js",
|
||||||
"thirdparty/apiclient/apiclient.js",
|
"thirdparty/apiclient/apiclient.js"
|
||||||
"thirdparty/apiclient/connectservice.js"
|
|
||||||
}.ToList();
|
}.ToList();
|
||||||
|
|
||||||
if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
apiClientFiles.Add("thirdparty/cordova/serverdiscovery.js");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
apiClientFiles.Add("thirdparty/apiclient/serverdiscovery.js");
|
|
||||||
}
|
|
||||||
apiClientFiles.Add("thirdparty/apiclient/connectionmanager.js");
|
apiClientFiles.Add("thirdparty/apiclient/connectionmanager.js");
|
||||||
|
|
||||||
foreach (var file in apiClientFiles)
|
foreach (var file in apiClientFiles)
|
||||||
|
@ -559,30 +549,14 @@ namespace MediaBrowser.WebDashboard.Api
|
||||||
"taskbutton.js",
|
"taskbutton.js",
|
||||||
"alphapicker.js",
|
"alphapicker.js",
|
||||||
"addpluginpage.js",
|
"addpluginpage.js",
|
||||||
"autoorganizetv.js",
|
|
||||||
"autoorganizelog.js",
|
|
||||||
"dashboardgeneral.js",
|
|
||||||
"dashboardpage.js",
|
"dashboardpage.js",
|
||||||
"directorybrowser.js",
|
"directorybrowser.js",
|
||||||
"editcollectionitems.js",
|
"editcollectionitems.js",
|
||||||
"edititemmetadata.js",
|
"edititemmetadata.js",
|
||||||
"playbackconfiguration.js",
|
|
||||||
"cinemamodeconfiguration.js",
|
|
||||||
"indexpage.js",
|
"indexpage.js",
|
||||||
"itembynamedetailpage.js",
|
|
||||||
"itemdetailpage.js",
|
"itemdetailpage.js",
|
||||||
"librarypathmapping.js",
|
|
||||||
"livetvrecording.js",
|
|
||||||
"livetvtimer.js",
|
|
||||||
"livetvseriestimer.js",
|
|
||||||
"medialibrarypage.js",
|
|
||||||
"metadataconfigurationpage.js",
|
|
||||||
"metadataimagespage.js",
|
|
||||||
"metadatasubtitles.js",
|
|
||||||
"moviecollections.js",
|
"moviecollections.js",
|
||||||
"notifications.js",
|
"notifications.js",
|
||||||
"playlists.js",
|
|
||||||
"playlistedit.js",
|
|
||||||
"plugincatalogpage.js",
|
"plugincatalogpage.js",
|
||||||
"pluginspage.js",
|
"pluginspage.js",
|
||||||
"remotecontrol.js",
|
"remotecontrol.js",
|
||||||
|
|
|
@ -126,12 +126,27 @@
|
||||||
<Content Include="dashboard-ui\thirdparty\apiclient\localassetmanager.js">
|
<Content Include="dashboard-ui\thirdparty\apiclient\localassetmanager.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\thirdparty\apiclient\wakeonlan.js">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\thirdparty\cordova\android\appstorage.js">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="dashboard-ui\thirdparty\cordova\android\localassetmanager.js">
|
<Content Include="dashboard-ui\thirdparty\cordova\android\localassetmanager.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\thirdparty\cordova\back.js">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="dashboard-ui\thirdparty\cordova\ios\orientation.js">
|
<Content Include="dashboard-ui\thirdparty\cordova\ios\orientation.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\thirdparty\cordova\volume.js">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
|
<Content Include="dashboard-ui\thirdparty\cordova\wakeonlan.js">
|
||||||
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
|
</Content>
|
||||||
<Content Include="dashboard-ui\thirdparty\velocity.min.js">
|
<Content Include="dashboard-ui\thirdparty\velocity.min.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
@ -1013,9 +1028,6 @@
|
||||||
<Content Include="dashboard-ui\thirdparty\apiclient\credentials.js">
|
<Content Include="dashboard-ui\thirdparty\apiclient\credentials.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
<Content Include="dashboard-ui\thirdparty\apiclient\network.js">
|
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
|
||||||
</Content>
|
|
||||||
<Content Include="dashboard-ui\thirdparty\apiclient\serverdiscovery.js">
|
<Content Include="dashboard-ui\thirdparty\apiclient\serverdiscovery.js">
|
||||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||||
</Content>
|
</Content>
|
||||||
|
|
Loading…
Reference in a new issue