Merge branch 'master' into feature/ffmpeg-version-check

Emby.Naming/Common/NamingOptions.cs

@@ -142,7 +142,7 @@ namespace Emby.Naming.Common
 
             CleanStrings = new[]
             {
-                @"[ _\,\.\(\)\[\]\-](3d|sbs|tab|hsbs|htab|mvc|HDR|HDC|UHD|UltraHD|4k|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|cd[1-9]|r3|r5|bd5|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|2160p|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|\[.*\])([ _\,\.\(\)\[\]\-]|$)",
+                @"[ _\,\.\(\)\[\]\-](3d|sbs|tab|hsbs|htab|mvc|HDR|HDC|UHD|UltraHD|4k|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|cd[1-9]|r3|r5|bd5|bd|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|2160p|hrhd|hrhdtv|hddvd|bluray|x264|h264|xvid|xvidvd|xxx|www.www|\[.*\])([ _\,\.\(\)\[\]\-]|$)",
                 @"(\[.*\])"
             };
 

Emby.Server.Implementations/Library/LibraryManager.cs

@@ -144,6 +144,7 @@ namespace Emby.Server.Implementations.Library
         /// <param name="userviewManagerFactory">The userview manager.</param>
         /// <param name="mediaEncoder">The media encoder.</param>
         /// <param name="itemRepository">The item repository.</param>
+        /// <param name="imageProcessor">The image processor.</param>
         public LibraryManager(
             IServerApplicationHost appHost,
             ILogger<LibraryManager> logger,

Emby.Server.Implementations/Localization/Core/ca.json

@@ -92,5 +92,27 @@
     "UserStoppedPlayingItemWithValues": "{0} ha parat de reproduir {1}",
     "ValueHasBeenAddedToLibrary": "{0} ha sigut afegit a la teva llibreria",
     "ValueSpecialEpisodeName": "Especial - {0}",
-    "VersionNumber": "Versió {0}"
+    "VersionNumber": "Versió {0}",
+    "TaskDownloadMissingSubtitlesDescription": "Cerca a internet els subtítols que faltin a partir de la configuració de metadades.",
+    "TaskDownloadMissingSubtitles": "Descarrega els subtítols que faltin",
+    "TaskRefreshChannelsDescription": "Actualitza la informació dels canals d'internet.",
+    "TaskRefreshChannels": "Actualitza Canals",
+    "TaskCleanTranscodeDescription": "Elimina els arxius temporals de transcodificacions que tinguin més d'un dia.",
+    "TaskCleanTranscode": "Neteja les transcodificacions",
+    "TaskUpdatePluginsDescription": "Actualitza les extensions que estan configurades per actualitzar-se automàticament.",
+    "TaskUpdatePlugins": "Actualitza les extensions",
+    "TaskRefreshPeopleDescription": "Actualitza les metadades dels actors i directors de la teva mediateca.",
+    "TaskRefreshPeople": "Actualitza Persones",
+    "TaskCleanLogsDescription": "Esborra els logs que tinguin més de {0} dies.",
+    "TaskCleanLogs": "Neteja els registres",
+    "TaskRefreshLibraryDescription": "Escaneja la mediateca buscant fitxers nous i refresca les metadades.",
+    "TaskRefreshLibrary": "Escaneja la biblioteca de mitjans",
+    "TaskRefreshChapterImagesDescription": "Crea les miniatures dels vídeos que tinguin capítols.",
+    "TaskRefreshChapterImages": "Extreure les imatges dels capítols",
+    "TaskCleanCacheDescription": "Elimina els arxius temporals que ja no són necessaris per al servidor.",
+    "TaskCleanCache": "Elimina arxius temporals",
+    "TasksChannelsCategory": "Canals d'internet",
+    "TasksApplicationCategory": "Aplicació",
+    "TasksLibraryCategory": "Biblioteca",
+    "TasksMaintenanceCategory": "Manteniment"
 }

MediaBrowser.Api/Devices/DeviceService.cs

@@ -1,4 +1,3 @@
-using System.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Devices;
 using MediaBrowser.Controller.Net;
@@ -40,33 +39,6 @@ namespace MediaBrowser.Api.Devices
         public string Id { get; set; }
     }
 
-    [Route("/Devices/CameraUploads", "GET", Summary = "Gets camera upload history for a device")]
-    [Authenticated]
-    public class GetCameraUploads : IReturn<ContentUploadHistory>
-    {
-        [ApiMember(Name = "Id", Description = "Device Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
-        public string DeviceId { get; set; }
-    }
-
-    [Route("/Devices/CameraUploads", "POST", Summary = "Uploads content")]
-    [Authenticated]
-    public class PostCameraUpload : IRequiresRequestStream, IReturnVoid
-    {
-        [ApiMember(Name = "DeviceId", Description = "Device Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string DeviceId { get; set; }
-
-        [ApiMember(Name = "Album", Description = "Album", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Album { get; set; }
-
-        [ApiMember(Name = "Name", Description = "Name", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Name { get; set; }
-
-        [ApiMember(Name = "Id", Description = "Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string Id { get; set; }
-
-        public Stream RequestStream { get; set; }
-    }
-
     [Route("/Devices/Options", "POST", Summary = "Updates device options")]
     [Authenticated(Roles = "Admin")]
     public class PostDeviceOptions : DeviceOptions, IReturnVoid

MediaBrowser.Controller/Devices/CameraImageUploadInfo.cs

@@ -1,10 +0,0 @@
-using MediaBrowser.Model.Devices;
-
-namespace MediaBrowser.Controller.Devices
-{
-    public class CameraImageUploadInfo
-    {
-        public LocalFileInfo FileInfo { get; set; }
-        public DeviceInfo Device { get; set; }
-    }
-}

MediaBrowser.Model/Devices/ContentUploadHistory.cs

@@ -1,19 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-using System;
-
-namespace MediaBrowser.Model.Devices
-{
-    public class ContentUploadHistory
-    {
-        public string DeviceId { get; set; }
-
-        public LocalFileInfo[] FilesUploaded { get; set; }
-
-        public ContentUploadHistory()
-        {
-            FilesUploaded = Array.Empty<LocalFileInfo>();
-        }
-    }
-}

MediaBrowser.Model/Devices/DeviceOptions.cs

@@ -4,6 +4,6 @@ namespace MediaBrowser.Model.Devices
 {
     public class DeviceOptions
     {
-        public string CustomName { get; set; }
+        public string? CustomName { get; set; }
     }
 }

MediaBrowser.Model/Devices/LocalFileInfo.cs

@@ -1,16 +0,0 @@
-#nullable disable
-#pragma warning disable CS1591
-
-namespace MediaBrowser.Model.Devices
-{
-    public class LocalFileInfo
-    {
-        public string Name { get; set; }
-
-        public string Id { get; set; }
-
-        public string Album { get; set; }
-
-        public string MimeType { get; set; }
-    }
-}

MediaBrowser.Model/SyncPlay/GroupInfoView.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 using System.Collections.Generic;
 
 namespace MediaBrowser.Model.SyncPlay

MediaBrowser.Model/SyncPlay/GroupUpdate.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>

MediaBrowser.Model/SyncPlay/SendCommand.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>

MediaBrowser.Model/SyncPlay/UtcTimeResponse.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 namespace MediaBrowser.Model.SyncPlay
 {
     /// <summary>

MediaBrowser.Model/Updates/VersionInfo.cs

@@ -1,3 +1,5 @@
+#nullable disable
+
 using System;
 
 namespace MediaBrowser.Model.Updates