Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix spelling #11103

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh
@@ -1,6 +1,6 @@
#!/bin/bash

## configure the following for a manuall install of a specific version from the repo
## configure the following for a manual install of a specific version from the repo

# wget https://repo.jellyfin.org/releases/server/ubuntu/versions/jellyfin-ffmpeg/6.0.1-1/jellyfin-ffmpeg6_6.0.1-1-jammy_amd64.deb -O ffmpeg.deb

Expand Down
2 changes: 1 addition & 1 deletion Emby.Server.Implementations/Data/BaseSqliteRepository.cs
Expand Up @@ -64,7 +64,7 @@ protected BaseSqliteRepository(ILogger<BaseSqliteRepository> logger)

/// <summary>
/// Gets the journal size limit. <see href="https://www.sqlite.org/pragma.html#pragma_journal_size_limit" />.
/// The default (-1) is overriden to prevent unconstrained WAL size, as reported by users.
/// The default (-1) is overridden to prevent unconstrained WAL size, as reported by users.
/// </summary>
/// <value>The journal size limit.</value>
protected virtual int? JournalSizeLimit => 134_217_728; // 128MiB
Expand Down
2 changes: 1 addition & 1 deletion Emby.Server.Implementations/Data/SqliteItemRepository.cs
Expand Up @@ -1263,7 +1263,7 @@ internal ItemImageInfo ItemImageInfoFromValueString(ReadOnlySpan<char> value)
/// <param name="id">The id.</param>
/// <returns>BaseItem.</returns>
/// <exception cref="ArgumentNullException"><paramref name="id"/> is <c>null</c>.</exception>
/// <exception cref="ArgumentException"><paramr name="id"/> is <seealso cref="Guid.Empty"/>.</exception>
/// <exception cref="ArgumentException"><paramref name="id"/> is <seealso cref="Guid.Empty"/>.</exception>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not certain about this, but there wasn't any strong hint justifying the divergence..

public BaseItem RetrieveItem(Guid id)
{
if (id.IsEmpty())
Expand Down
4 changes: 2 additions & 2 deletions Emby.Server.Implementations/IO/ManagedFileSystem.cs
Expand Up @@ -558,7 +558,7 @@ public virtual IEnumerable<FileSystemMetadata> GetFiles(string path, IReadOnlyLi
{
var enumerationOptions = GetEnumerationOptions(recursive);

// On linux and osx the search pattern is case sensitive
// On linux and macOS the search pattern is case-sensitive
// If we're OK with case-sensitivity, and we're only filtering for one extension, then use the native method
if ((enableCaseSensitiveExtensions || _isEnvironmentCaseInsensitive) && extensions is not null && extensions.Count == 1)
{
Expand Down Expand Up @@ -615,7 +615,7 @@ public virtual IEnumerable<string> GetFilePaths(string path, string[]? extension
{
var enumerationOptions = GetEnumerationOptions(recursive);

// On linux and osx the search pattern is case sensitive
// On linux and macOS the search pattern is case-sensitive
// If we're OK with case-sensitivity, and we're only filtering for one extension, then use the native method
if ((enableCaseSensitiveExtensions || _isEnvironmentCaseInsensitive) && extensions is not null && extensions.Length == 1)
{
Expand Down
14 changes: 7 additions & 7 deletions Emby.Server.Implementations/Library/MediaSourceManager.cs
Expand Up @@ -38,7 +38,7 @@ namespace Emby.Server.Implementations.Library
public class MediaSourceManager : IMediaSourceManager, IDisposable
{
// Do not use a pipe here because Roku http requests to the server will fail, without any explicit error message.
private const char LiveStreamIdDelimeter = '_';
private const char LiveStreamIdDelimiter = '_';

private readonly IServerApplicationHost _appHost;
private readonly IItemRepository _itemRepo;
Expand Down Expand Up @@ -302,7 +302,7 @@ private async Task<IEnumerable<MediaSourceInfo>> GetDynamicMediaSources(BaseItem

private static void SetKeyProperties(IMediaSourceProvider provider, MediaSourceInfo mediaSource)
{
var prefix = provider.GetType().FullName.GetMD5().ToString("N", CultureInfo.InvariantCulture) + LiveStreamIdDelimeter;
var prefix = provider.GetType().FullName.GetMD5().ToString("N", CultureInfo.InvariantCulture) + LiveStreamIdDelimiter;

if (!string.IsNullOrEmpty(mediaSource.OpenToken) && !mediaSource.OpenToken.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
{
Expand Down Expand Up @@ -390,17 +390,17 @@ private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData
var preferredSubs = NormalizeLanguage(user.SubtitleLanguagePreference);

var defaultAudioIndex = source.DefaultAudioStreamIndex;
var audioLangage = defaultAudioIndex is null
var audioLanguage = defaultAudioIndex is null
? null
: source.MediaStreams.Where(i => i.Type == MediaStreamType.Audio && i.Index == defaultAudioIndex).Select(i => i.Language).FirstOrDefault();

source.DefaultSubtitleStreamIndex = MediaStreamSelector.GetDefaultSubtitleStreamIndex(
source.MediaStreams,
preferredSubs,
user.SubtitleMode,
audioLangage);
audioLanguage);

MediaStreamSelector.SetSubtitleStreamScores(source.MediaStreams, preferredSubs, user.SubtitleMode, audioLangage);
MediaStreamSelector.SetSubtitleStreamScores(source.MediaStreams, preferredSubs, user.SubtitleMode, audioLanguage);
}

private void SetDefaultAudioStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection)
Expand Down Expand Up @@ -857,11 +857,11 @@ public async Task CloseLiveStream(string id)
{
ArgumentException.ThrowIfNullOrEmpty(key);

var keys = key.Split(LiveStreamIdDelimeter, 2);
var keys = key.Split(LiveStreamIdDelimiter, 2);

var provider = _providers.FirstOrDefault(i => string.Equals(i.GetType().FullName.GetMD5().ToString("N", CultureInfo.InvariantCulture), keys[0], StringComparison.OrdinalIgnoreCase));

var splitIndex = key.IndexOf(LiveStreamIdDelimeter, StringComparison.Ordinal);
var splitIndex = key.IndexOf(LiveStreamIdDelimiter, StringComparison.Ordinal);
var keyId = key.Substring(splitIndex + 1);

return (provider, keyId);
Expand Down
Expand Up @@ -231,13 +231,13 @@ public IEnumerable<ParentalRating> GetParentalRatings()
ratings.Add(new ParentalRating("21", 21));
}

// A lot of countries don't excplicitly have a seperate rating for adult content
// A lot of countries don't explicitly have a separate rating for adult content
if (ratings.All(x => x.Value != 1000))
{
ratings.Add(new ParentalRating("XXX", 1000));
}

// A lot of countries don't excplicitly have a seperate rating for banned content
// A lot of countries don't explicitly have a separate rating for banned content
if (ratings.All(x => x.Value != 1001))
{
ratings.Add(new ParentalRating("Banned", 1001));
Expand Down
14 changes: 7 additions & 7 deletions Emby.Server.Implementations/Plugins/PluginManager.cs
Expand Up @@ -119,7 +119,7 @@ public IEnumerable<Assembly> LoadAssemblies()
// Now load the assemblies..
foreach (var plugin in _plugins)
{
UpdatePluginSuperceedStatus(plugin);
UpdatePluginSupersededStatus(plugin);

if (plugin.IsEnabledAndSupported == false)
{
Expand Down Expand Up @@ -214,7 +214,7 @@ public void RegisterServices(IServiceCollection serviceCollection)
continue;
}

UpdatePluginSuperceedStatus(plugin);
UpdatePluginSupersededStatus(plugin);
if (!plugin.IsEnabledAndSupported)
{
continue;
Expand Down Expand Up @@ -624,9 +624,9 @@ private bool ChangePluginState(LocalPlugin plugin, PluginStatus state)
}
}

private void UpdatePluginSuperceedStatus(LocalPlugin plugin)
private void UpdatePluginSupersededStatus(LocalPlugin plugin)
{
if (plugin.Manifest.Status != PluginStatus.Superceded)
if (plugin.Manifest.Status != PluginStatus.Superseded)
{
return;
}
Expand Down Expand Up @@ -879,7 +879,7 @@ private bool TryGetPluginDlls(LocalPlugin plugin, out IReadOnlyList<string> whit
}

/// <summary>
/// Changes the status of the other versions of the plugin to "Superceded".
/// Changes the status of the other versions of the plugin to "Superseded".
/// </summary>
/// <param name="plugin">The <see cref="LocalPlugin"/> that's master.</param>
private void ProcessAlternative(LocalPlugin plugin)
Expand All @@ -899,11 +899,11 @@ private void ProcessAlternative(LocalPlugin plugin)
return;
}

if (plugin.Manifest.Status == PluginStatus.Active && !ChangePluginState(previousVersion, PluginStatus.Superceded))
if (plugin.Manifest.Status == PluginStatus.Active && !ChangePluginState(previousVersion, PluginStatus.Superseded))
{
_logger.LogError("Unable to enable version {Version} of {Name}", previousVersion.Version, previousVersion.Name);
}
else if (plugin.Manifest.Status == PluginStatus.Superceded && !ChangePluginState(previousVersion, PluginStatus.Active))
else if (plugin.Manifest.Status == PluginStatus.Superseded && !ChangePluginState(previousVersion, PluginStatus.Active))
{
_logger.LogError("Unable to supercede version {Version} of {Name}", previousVersion.Version, previousVersion.Name);
}
Expand Down
Expand Up @@ -609,7 +609,7 @@ protected virtual void Dispose(bool dispose)
{
DisposeTriggers();

var wassRunning = State == TaskState.Running;
var wasRunning = State == TaskState.Running;
var startTime = CurrentExecutionStartTime;

var token = CurrentCancellationTokenSource;
Expand Down Expand Up @@ -662,7 +662,7 @@ protected virtual void Dispose(bool dispose)
}
}

if (wassRunning)
if (wasRunning)
{
OnTaskCompleted(startTime, DateTime.UtcNow, TaskCompletionStatus.Aborted, null);
}
Expand Down
Expand Up @@ -90,7 +90,7 @@ public async Task ExecuteAsync(IProgress<double> progress, CancellationToken can
}
catch (OperationCanceledException)
{
// InstallPackage has it's own inner cancellation token, so only throw this if it's ours
// InstallPackage has its own inner cancellation token, so only throw this if it's ours
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's = it is which is not intended here

if (cancellationToken.IsCancellationRequested)
{
throw;
Expand Down
4 changes: 2 additions & 2 deletions Emby.Server.Implementations/Session/SessionManager.cs
Expand Up @@ -1252,7 +1252,7 @@ private IEnumerable<BaseItem> TranslateItemForPlayback(Guid id, User user)

if (item is null)
{
_logger.LogError("A non-existent item Id {0} was passed into TranslateItemForPlayback", id);
_logger.LogError("A nonexistent item Id {0} was passed into TranslateItemForPlayback", id);
return Array.Empty<BaseItem>();
}

Expand Down Expand Up @@ -1305,7 +1305,7 @@ private IEnumerable<BaseItem> TranslateItemForInstantMix(Guid id, User user)

if (item is null)
{
_logger.LogError("A non-existent item Id {0} was passed into TranslateItemForInstantMix", id);
_logger.LogError("A nonexistent item Id {0} was passed into TranslateItemForInstantMix", id);
return new List<BaseItem>();
}

Expand Down
2 changes: 1 addition & 1 deletion Emby.Server.Implementations/Updates/InstallationManager.cs
Expand Up @@ -187,7 +187,7 @@ public async Task<IReadOnlyList<PackageInfo>> GetAvailablePackages(CancellationT
await _pluginManager.PopulateManifest(package, version.VersionNumber, plugin.Path, plugin.Manifest.Status).ConfigureAwait(false);
}

// Remove versions with a target ABI greater then the current application version.
// Remove versions with a target ABI greater than the current application version.
if (Version.TryParse(version.TargetAbi, out var targetAbi) && _applicationHost.ApplicationVersion < targetAbi)
{
package.Versions.RemoveAt(i);
Expand Down
6 changes: 3 additions & 3 deletions Jellyfin.Api/Controllers/UserLibraryController.cs
Expand Up @@ -698,10 +698,10 @@ private async Task RefreshItemOnDemandIfNeeded(BaseItem item)
{
if (item is Person)
{
var hasMetdata = !string.IsNullOrWhiteSpace(item.Overview) && item.HasImage(ImageType.Primary);
var performFullRefresh = !hasMetdata && (DateTime.UtcNow - item.DateLastRefreshed).TotalDays >= 3;
var hasMetadata = !string.IsNullOrWhiteSpace(item.Overview) && item.HasImage(ImageType.Primary);
var performFullRefresh = !hasMetadata && (DateTime.UtcNow - item.DateLastRefreshed).TotalDays >= 3;

if (!hasMetdata)
if (!hasMetadata)
{
var options = new MetadataRefreshOptions(new DirectoryService(_fileSystem))
{
Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Api/Models/MediaInfoDtos/OpenLiveStreamDto.cs
Expand Up @@ -61,7 +61,7 @@ public class OpenLiveStreamDto
public bool? EnableDirectPlay { get; set; }

/// <summary>
/// Gets or sets a value indicating whether to enale direct stream.
/// Gets or sets a value indicating whether to enable direct stream.
/// </summary>
public bool? EnableDirectStream { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Api/Models/MediaInfoDtos/PlaybackInfoDto.cs
Expand Up @@ -4,7 +4,7 @@
namespace Jellyfin.Api.Models.MediaInfoDtos;

/// <summary>
/// Plabyback info dto.
/// Playback info dto.
/// </summary>
public class PlaybackInfoDto
{
Expand Down
4 changes: 2 additions & 2 deletions Jellyfin.Data/Entities/Libraries/CollectionItem.cs
Expand Up @@ -43,15 +43,15 @@ public CollectionItem(LibraryItem libraryItem)
/// Gets or sets the next item in the collection.
/// </summary>
/// <remarks>
/// TODO check if this properly updated Dependant and has the proper principal relationship.
/// TODO check if this properly updated Dependent and has the proper principal relationship.
/// </remarks>
public virtual CollectionItem? Next { get; set; }

/// <summary>
/// Gets or sets the previous item in the collection.
/// </summary>
/// <remarks>
/// TODO check if this properly updated Dependant and has the proper principal relationship.
/// TODO check if this properly updated Dependent and has the proper principal relationship.
/// </remarks>
public virtual CollectionItem? Previous { get; set; }

Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Data/Entities/TrickplayInfo.cs
Expand Up @@ -66,7 +66,7 @@ public class TrickplayInfo
public int Interval { get; set; }

/// <summary>
/// Gets or sets peak bandwith usage in bits per second.
/// Gets or sets peak bandwidth usage in bits per second.
/// </summary>
/// <remarks>
/// Required.
Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Server.Implementations/JellyfinDbContext.cs
Expand Up @@ -187,7 +187,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
modelBuilder.SetDefaultDateTimeKind(DateTimeKind.Utc);
base.OnModelCreating(modelBuilder);

// Configuration for each entity is in it's own class inside 'ModelConfiguration'.
// Configuration for each entity is in its own class inside 'ModelConfiguration'.
modelBuilder.ApplyConfigurationsFromAssembly(typeof(JellyfinDbContext).Assembly);
}
}
Expand Up @@ -46,7 +46,7 @@ public class TrickplayManager : ITrickplayManager
/// </summary>
/// <param name="logger">The logger.</param>
/// <param name="mediaEncoder">The media encoder.</param>
/// <param name="fileSystem">The file systen.</param>
/// <param name="fileSystem">The file system.</param>
/// <param name="encodingHelper">The encoding helper.</param>
/// <param name="libraryManager">The library manager.</param>
/// <param name="config">The server configuration manager.</param>
Expand Down
Expand Up @@ -46,7 +46,7 @@ public CreateUserLoggingConfigFile(IApplicationPaths appPaths)
public Guid Id => Guid.Parse("{EF103419-8451-40D8-9F34-D1A8E93A1679}");

/// <inheritdoc/>
public string Name => "CreateLoggingConfigHeirarchy";
public string Name => "CreateLoggingConfigHierarchy";
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change might be observable


/// <inheritdoc/>
public bool PerformOnNewInstall => false;
Expand Down
2 changes: 1 addition & 1 deletion MediaBrowser.Common/Configuration/IConfigurationManager.cs
Expand Up @@ -61,7 +61,7 @@ void RegisterConfiguration<T>()
object GetConfiguration(string key);

/// <summary>
/// Gets the array of coniguration stores.
/// Gets the array of configuration stores.
/// </summary>
/// <returns>Array of ConfigurationStore.</returns>
ConfigurationStore[] GetConfigurationStores();
Expand Down
2 changes: 1 addition & 1 deletion MediaBrowser.Controller/Entities/BaseItem.cs
Expand Up @@ -1775,7 +1775,7 @@ public void SetStudios(IEnumerable<string> names)
/// Adds a genre to the item.
/// </summary>
/// <param name="name">The name.</param>
/// <exception cref="ArgumentNullException">Throwns if name is null.</exception>
/// <exception cref="ArgumentNullException">Throws if name is null.</exception>
public void AddGenre(string name)
{
ArgumentException.ThrowIfNullOrEmpty(name);
Expand Down
2 changes: 1 addition & 1 deletion MediaBrowser.Controller/Library/IMediaSourceManager.cs
Expand Up @@ -53,7 +53,7 @@ public interface IMediaSourceManager
List<MediaAttachment> GetMediaAttachments(MediaAttachmentQuery query);

/// <summary>
/// Gets the playack media sources.
/// Gets the playback media sources.
/// </summary>
/// <param name="item">Item to use.</param>
/// <param name="user">User to use for operation.</param>
Expand Down
8 changes: 4 additions & 4 deletions MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
Expand Up @@ -46,7 +46,7 @@ public partial class EncodingHelper
private readonly Version _maxKerneli915Hang = new Version(6, 1, 3);
private readonly Version _minFixedKernel60i915Hang = new Version(6, 0, 18);

private readonly Version _minFFmpegImplictHwaccel = new Version(6, 0);
private readonly Version _minFFmpegImplicitHwaccel = new Version(6, 0);
private readonly Version _minFFmpegHwaUnsafeOutput = new Version(6, 0);
private readonly Version _minFFmpegOclCuTonemapMode = new Version(5, 1, 3);
private readonly Version _minFFmpegSvtAv1Params = new Version(5, 1);
Expand Down Expand Up @@ -3441,7 +3441,7 @@ public string GetHwTonemapFilter(EncodingOptions options, string hwTonemapSuffix
mainFilters.Add(swScaleFilter);
mainFilters.Add("format=" + outFormat);

// sw tonemap <= TODO: finsh the fast tonemap filter
// sw tonemap <= TODO: finish the fast tonemap filter

// OUTPUT yuv420p/nv12 surface(memory)

Expand Down Expand Up @@ -3758,7 +3758,7 @@ public string GetHwTonemapFilter(EncodingOptions options, string hwTonemapSuffix
// map from d3d11va to opencl via d3d11-opencl interop.
mainFilters.Add("hwmap=derive_device=opencl");

// hw deint <= TODO: finsh the 'yadif_opencl' filter
// hw deint <= TODO: finish the 'yadif_opencl' filter

var outFormat = doOclTonemap ? string.Empty : "nv12";
var hwScaleFilter = GetHwScaleFilter("opencl", outFormat, inW, inH, reqW, reqH, reqMaxW, reqMaxH);
Expand Down Expand Up @@ -5734,7 +5734,7 @@ public string GetHwaccelType(EncodingJobInfo state, EncodingOptions options, str
var ffmpegVersion = _mediaEncoder.EncoderVersion;

// Set the av1 codec explicitly to trigger hw accelerator, otherwise libdav1d will be used.
var isAv1 = ffmpegVersion < _minFFmpegImplictHwaccel
var isAv1 = ffmpegVersion < _minFFmpegImplicitHwaccel
&& string.Equals(videoCodec, "av1", StringComparison.OrdinalIgnoreCase);

// Allow profile mismatch if decoding H.264 baseline with d3d11va and vaapi hwaccels.
Expand Down
4 changes: 2 additions & 2 deletions MediaBrowser.Controller/Net/IWebSocketConnection.cs
Expand Up @@ -24,9 +24,9 @@ public interface IWebSocketConnection : IAsyncDisposable, IDisposable
DateTime LastActivityDate { get; }

/// <summary>
/// Gets or sets the date of last Keeplive received.
/// Gets or sets the date of last Keepalive received.
/// </summary>
/// <value>The date of last Keeplive received.</value>
/// <value>The date of last Keepalive received.</value>
DateTime LastKeepAliveDate { get; set; }

/// <summary>
Expand Down
2 changes: 1 addition & 1 deletion MediaBrowser.Controller/Sorting/IUserBaseItemComparer.cs
Expand Up @@ -5,7 +5,7 @@
namespace MediaBrowser.Controller.Sorting
{
/// <summary>
/// Represents a BaseItem comparer that requires a User to perform it's comparison.
/// Represents a BaseItem comparer that requires a User to perform its comparison.
/// </summary>
public interface IUserBaseItemComparer : IBaseItemComparer
{
Expand Down