Merge pull request #16 from nicknsy/beta

Update to 1.0.0.3

.editorconfig

@@ -0,0 +1,194 @@
+# With more recent updates Visual Studio 2017 supports EditorConfig files out of the box
+# Visual Studio Code needs an extension: https://github.com/editorconfig/editorconfig-vscode
+# For emacs, vim, np++ and other editors, see here: https://github.com/editorconfig
+###############################
+# Core EditorConfig Options   #
+###############################
+root = true
+# All files
+[*]
+indent_style = space
+indent_size = 4
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+max_line_length = off
+
+# YAML indentation
+[*.{yml,yaml}]
+indent_size = 2
+
+# XML indentation
+[*.{csproj,xml}]
+indent_size = 2
+
+###############################
+# .NET Coding Conventions     #
+###############################
+[*.{cs,vb}]
+# Organize usings
+dotnet_sort_system_directives_first = true
+# this. preferences
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
+dotnet_style_readonly_field = true:suggestion
+# Expression-level preferences
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+
+###############################
+# Naming Conventions          #
+###############################
+# Style Definitions (From Roslyn)
+
+# Non-private static fields are PascalCase
+dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.symbols = non_private_static_fields
+dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.style = non_private_static_field_style
+
+dotnet_naming_symbols.non_private_static_fields.applicable_kinds = field
+dotnet_naming_symbols.non_private_static_fields.applicable_accessibilities = public, protected, internal, protected_internal, private_protected
+dotnet_naming_symbols.non_private_static_fields.required_modifiers = static
+
+dotnet_naming_style.non_private_static_field_style.capitalization = pascal_case
+
+# Constants are PascalCase
+dotnet_naming_rule.constants_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.constants_should_be_pascal_case.symbols = constants
+dotnet_naming_rule.constants_should_be_pascal_case.style = constant_style
+
+dotnet_naming_symbols.constants.applicable_kinds = field, local
+dotnet_naming_symbols.constants.required_modifiers = const
+
+dotnet_naming_style.constant_style.capitalization = pascal_case
+
+# Static fields are camelCase and start with s_
+dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields
+dotnet_naming_rule.static_fields_should_be_camel_case.style = static_field_style
+
+dotnet_naming_symbols.static_fields.applicable_kinds = field
+dotnet_naming_symbols.static_fields.required_modifiers = static
+
+dotnet_naming_style.static_field_style.capitalization = camel_case
+dotnet_naming_style.static_field_style.required_prefix = _
+
+# Instance fields are camelCase and start with _
+dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
+dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
+
+dotnet_naming_symbols.instance_fields.applicable_kinds = field
+
+dotnet_naming_style.instance_field_style.capitalization = camel_case
+dotnet_naming_style.instance_field_style.required_prefix = _
+
+# Locals and parameters are camelCase
+dotnet_naming_rule.locals_should_be_camel_case.severity = suggestion
+dotnet_naming_rule.locals_should_be_camel_case.symbols = locals_and_parameters
+dotnet_naming_rule.locals_should_be_camel_case.style = camel_case_style
+
+dotnet_naming_symbols.locals_and_parameters.applicable_kinds = parameter, local
+
+dotnet_naming_style.camel_case_style.capitalization = camel_case
+
+# Local functions are PascalCase
+dotnet_naming_rule.local_functions_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.local_functions_should_be_pascal_case.symbols = local_functions
+dotnet_naming_rule.local_functions_should_be_pascal_case.style = local_function_style
+
+dotnet_naming_symbols.local_functions.applicable_kinds = local_function
+
+dotnet_naming_style.local_function_style.capitalization = pascal_case
+
+# By default, name items with PascalCase
+dotnet_naming_rule.members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.members_should_be_pascal_case.symbols = all_members
+dotnet_naming_rule.members_should_be_pascal_case.style = pascal_case_style
+
+dotnet_naming_symbols.all_members.applicable_kinds = *
+
+dotnet_naming_style.pascal_case_style.capitalization = pascal_case
+
+###############################
+# C# Coding Conventions       #
+###############################
+[*.cs]
+# var preferences
+csharp_style_var_for_built_in_types = true:silent
+csharp_style_var_when_type_is_apparent = true:silent
+csharp_style_var_elsewhere = true:silent
+# Expression-bodied members
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_accessors = true:silent
+# Pattern matching preferences
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+# Null-checking preferences
+csharp_style_throw_expression = true:suggestion
+csharp_style_conditional_delegate_call = true:suggestion
+# Modifier preferences
+csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
+# Expression-level preferences
+csharp_prefer_braces = true:silent
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_pattern_local_over_anonymous_function = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+
+###############################
+# C# Formatting Rules         #
+###############################
+# New line preferences
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+# Indentation preferences
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = flush_left
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+# Wrapping preferences
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true

.github/dependabot.yml

@@ -0,0 +1,13 @@
+version: 2
+updates:
+- package-ecosystem: nuget
+  directory: '/'
+  schedule:
+    interval: weekly
+  open-pull-requests-limit: 10
+
+- package-ecosystem: github-actions
+  directory: '/'
+  schedule:
+    interval: monthly
+  open-pull-requests-limit: 10

.github/workflows/build.yaml

@@ -0,0 +1,17 @@
+name: 'Build Plugin'
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '**/*.md'
+  pull_request:
+    branches:
+      - main
+    paths-ignore:
+      - '**/*.md'
+
+jobs:
+  call:
+    uses: jellyfin/jellyfin-meta-plugins/.github/workflows/build.yaml@master

.github/workflows/publish.yaml

@@ -0,0 +1,15 @@
+name: 'Publish Plugin'
+
+on:
+  workflow_dispatch:
+
+jobs:
+  call:
+    uses: jellyfin/jellyfin-meta-plugins/.github/workflows/publish.yaml@master
+    with:
+      version: ${{ github.event.release.tag_name }}
+      is-unstable: ${{ github.event.release.prerelease }}
+    secrets:
+      deploy-host: ${{ secrets.DEPLOY_HOST }}
+      deploy-user: ${{ secrets.DEPLOY_USER }}
+      deploy-key: ${{ secrets.DEPLOY_KEY }}

Nick.Plugin.Jellyscrub/Api/TrickplayController.cs

@@ -1,5 +1,7 @@
 using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.MediaEncoding;
 using MediaBrowser.Model.IO;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
@@ -29,6 +31,9 @@ public class TrickplayController : ControllerBase
     private readonly ILoggerFactory _loggerFactory;
     private readonly IApplicationPaths _appPaths;
     private readonly ILibraryMonitor _libraryMonitor;
+    private readonly IMediaEncoder _mediaEncoder;
+    private readonly IServerConfigurationManager _configurationManager;
+
     private readonly PluginConfiguration _config;
 
     /// <summary>
@@ -40,7 +45,9 @@ public TrickplayController(
         ILogger<TrickplayController> logger,
         ILoggerFactory loggerFactory,
         IApplicationPaths appPaths,
-        ILibraryMonitor libraryMonitor)
+        ILibraryMonitor libraryMonitor,
+        IMediaEncoder mediaEncoder,
+        IServerConfigurationManager configurationManager)
     {
         _assembly = Assembly.GetExecutingAssembly();
         _trickplayScriptPath = GetType().Namespace + ".trickplay.js";
@@ -51,6 +58,9 @@ public TrickplayController(
         _loggerFactory = loggerFactory;
         _appPaths = appPaths;
         _libraryMonitor = libraryMonitor;
+        _mediaEncoder = mediaEncoder;
+        _configurationManager = configurationManager;
+
         _config = JellyscrubPlugin.Instance!.Configuration;
     }
 
@@ -102,7 +112,7 @@ public async Task<ActionResult> GetManifest([FromRoute, Required] Guid itemId)
             }
             else if (_config.OnDemandGeneration)
             {
-                new VideoProcessor(_loggerFactory.CreateLogger<VideoProcessor>(), _fileSystem, _appPaths, _libraryMonitor)
+                new VideoProcessor(_loggerFactory, _loggerFactory.CreateLogger<VideoProcessor>(), _mediaEncoder, _configurationManager, _fileSystem, _appPaths, _libraryMonitor)
                     .Run(item, CancellationToken.None);
                 return StatusCode(503);
             }
@@ -140,7 +150,7 @@ public async Task<ActionResult> GetBIF([FromRoute, Required] Guid itemId, [FromR
             }
             else if (_config.OnDemandGeneration && _config.WidthResolutions.Contains(width))
             {
-                new VideoProcessor(_loggerFactory.CreateLogger<VideoProcessor>(), _fileSystem, _appPaths, _libraryMonitor)
+                new VideoProcessor(_loggerFactory, _loggerFactory.CreateLogger<VideoProcessor>(), _mediaEncoder, _configurationManager, _fileSystem, _appPaths, _libraryMonitor)
                     .Run(item, CancellationToken.None);
                 return StatusCode(503);
             }

Nick.Plugin.Jellyscrub/Api/trickplay.js

@@ -1,4 +1,5 @@
-const MANIFEST_ENDPOINT = '/Trickplay/{itemId}/GetManifest';
+const JELLYSCRUB_GUID = 'a84a949d-4b73-4099-aacb-8341b4da17ba';
+const MANIFEST_ENDPOINT = '/Trickplay/{itemId}/GetManifest';
 const BIF_ENDPOINT = '/Trickplay/{itemId}/{width}/GetBIF';
 const RETRY_INTERVAL = 60_000;  // ms (1 minute)
 
@@ -42,28 +43,34 @@ function info(msg) {
     console.info(LOG_PREFIX + msg);
 }
 
+/*
+ * Get config values
+ */
+
+// -- ApiClient hasn't loaded by this point... :(
+// -- Also needs to go in async function
+//const jellyscrubConfig = await ApiClient.getPluginConfiguration(JELLYSCRUB_GUID);
+//let STYLE_TRICKPLAY_CONTAINER = jellyscrubConfig.StyleTrickplayContainer ?? true;
+let STYLE_TRICKPLAY_CONTAINER = true;
+
 /*
  * Inject style to be used for slider bubble popup
  */
 
-let jellyscrubStyle = document.createElement('style');
-jellyscrubStyle.textContent = '.jellyscrubThumbText {margin: 0;}';
-document.body.insertBefore(jellyscrubStyle, document.body.firstChild);
+if (STYLE_TRICKPLAY_CONTAINER) {
+    let jellyscrubStyle = document.createElement('style');
+    jellyscrubStyle.id = 'jellscrubStyle';
+    jellyscrubStyle.textContent += '.chapterThumbContainer {width: 15vw; overflow: hidden;}';
+    jellyscrubStyle.textContent += '.chapterThumb {width: 100%; display: block; height: unset; min-height: unset; min-width: unset;}';
+    jellyscrubStyle.textContent += '.chapterThumbTextContainer {position: relative; background: rgb(38, 38, 38);}';
+    jellyscrubStyle.textContent += '.chapterThumbText {margin: 0; opacity: unset; padding: unset;}';
+    document.body.appendChild(jellyscrubStyle);
+}
 
 /*
  * Code for updating and locking mediaSourceId and getBubbleHtml 
  */
 
-// Remove slider observer on page change
-/* Breaking preview on clicking subtitles, settings as it pushes ?dlg=dlgXXXXXXXXXXXXX
-addEventListener('popstate', (event) => {
-    if (sliderObserver) {
-        sliderObserver.disconnect();
-        sliderObserver = null;
-    }
-});
-*/
-
 // Grab MediaSourceId from jellyfin-web internal API calls
 const { fetch: originalFetch } = window;
 
@@ -152,21 +159,25 @@ function containerCallback(mutationList, observer) {
                     //hiddenSliderBubble.classList.add('jellyscrub-hide');
 
                     let customBubble = document.createElement('div');
-                    customBubble.classList.add('sliderBubble', 'jellyscrub-slider', 'hide');
+                    customBubble.classList.add('sliderBubble', 'hide');
 
                     let customThumbContainer = document.createElement('div');
                     customThumbContainer.classList.add('chapterThumbContainer');
 
                     customThumbImg = document.createElement('img');
                     customThumbImg.classList.add('chapterThumb');
                     customThumbImg.src = 'data:,';
+                    // Fix for custom styles that set radius on EVERYTHING causing weird holes when both img and text container are rounded
+                    if (STYLE_TRICKPLAY_CONTAINER) customThumbImg.setAttribute('style', 'border-radius: unset !important;')
                     customThumbContainer.appendChild(customThumbImg);
 
                     let customChapterTextContainer = document.createElement('div');
                     customChapterTextContainer.classList.add('chapterThumbTextContainer');
+                    // Fix for custom styles that set radius on EVERYTHING causing weird holes when both img and text container are rounded
+                    if (STYLE_TRICKPLAY_CONTAINER) customChapterTextContainer.setAttribute('style', 'border-radius: unset !important;')
 
                     customChapterText = document.createElement('h2');
-                    customChapterText.classList.add('jellyscrubThumbText');
+                    customChapterText.classList.add('chapterThumbText');
                     customChapterText.textContent = '--:--';
                     customChapterTextContainer.appendChild(customChapterText);
 
@@ -189,7 +200,7 @@ function containerCallback(mutationList, observer) {
 };
 
 function sliderCallback(mutationList, observer) {
-    if (!trickplayData) return;
+    if (!customSliderBubble || !trickplayData) return;
 
     for (const mutation of mutationList) {
         switch(mutation.attributeName) {
@@ -477,4 +488,4 @@ function getDisplayRunningTime(ticks) {
     parts.push(seconds);
 
     return parts.join(':');
-}
+}