Skip to content

Commit 4a41cf4

Browse files
committed
Update for Jellyfin 10.7
1 parent ad8da4b commit 4a41cf4

File tree

11 files changed

+512
-435
lines changed

11 files changed

+512
-435
lines changed

.editorconfig

Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
# With more recent updates Visual Studio 2017 supports EditorConfig files out of the box
2+
# Visual Studio Code needs an extension: https://github.com/editorconfig/editorconfig-vscode
3+
# For emacs, vim, np++ and other editors, see here: https://github.com/editorconfig
4+
###############################
5+
# Core EditorConfig Options #
6+
###############################
7+
root = true
8+
9+
# All files
10+
[*]
11+
indent_style = space
12+
indent_size = 4
13+
charset = utf-8
14+
trim_trailing_whitespace = true
15+
insert_final_newline = true
16+
end_of_line = lf
17+
max_line_length = 9999
18+
19+
# YAML indentation
20+
[*.{yml,yaml}]
21+
indent_size = 2
22+
23+
# XML indentation
24+
[*.{csproj,xml}]
25+
indent_size = 2
26+
27+
###############################
28+
# .NET Coding Conventions #
29+
###############################
30+
31+
[*.{cs,vb}]
32+
# Organize usings
33+
dotnet_sort_system_directives_first = true
34+
# this. preferences
35+
dotnet_style_qualification_for_field = false:silent
36+
dotnet_style_qualification_for_property = false:silent
37+
dotnet_style_qualification_for_method = false:silent
38+
dotnet_style_qualification_for_event = false:silent
39+
# Language keywords vs BCL types preferences
40+
dotnet_style_predefined_type_for_locals_parameters_members = true:silent
41+
dotnet_style_predefined_type_for_member_access = true:silent
42+
# Parentheses preferences
43+
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
44+
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
45+
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
46+
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
47+
# Modifier preferences
48+
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
49+
dotnet_style_readonly_field = true:suggestion
50+
# Expression-level preferences
51+
dotnet_style_object_initializer = true:suggestion
52+
dotnet_style_collection_initializer = true:suggestion
53+
dotnet_style_explicit_tuple_names = true:suggestion
54+
dotnet_style_null_propagation = true:suggestion
55+
dotnet_style_coalesce_expression = true:suggestion
56+
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
57+
dotnet_style_prefer_inferred_tuple_names = true:suggestion
58+
dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
59+
dotnet_style_prefer_auto_properties = true:silent
60+
dotnet_style_prefer_conditional_expression_over_assignment = true:silent
61+
dotnet_style_prefer_conditional_expression_over_return = true:silent
62+
63+
###############################
64+
# Naming Conventions #
65+
###############################
66+
67+
# Style Definitions (From Roslyn)
68+
69+
# Non-private static fields are PascalCase
70+
dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.severity = suggestion
71+
dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.symbols = non_private_static_fields
72+
dotnet_naming_rule.non_private_static_fields_should_be_pascal_case.style = non_private_static_field_style
73+
74+
dotnet_naming_symbols.non_private_static_fields.applicable_kinds = field
75+
dotnet_naming_symbols.non_private_static_fields.applicable_accessibilities = public, protected, internal, protected_internal, private_protected
76+
dotnet_naming_symbols.non_private_static_fields.required_modifiers = static
77+
78+
dotnet_naming_style.non_private_static_field_style.capitalization = pascal_case
79+
80+
# Constants are PascalCase
81+
dotnet_naming_rule.constants_should_be_pascal_case.severity = suggestion
82+
dotnet_naming_rule.constants_should_be_pascal_case.symbols = constants
83+
dotnet_naming_rule.constants_should_be_pascal_case.style = constant_style
84+
85+
dotnet_naming_symbols.constants.applicable_kinds = field, local
86+
dotnet_naming_symbols.constants.required_modifiers = const
87+
88+
dotnet_naming_style.constant_style.capitalization = pascal_case
89+
90+
# Static fields are camelCase and start with s_
91+
dotnet_naming_rule.static_fields_should_be_camel_case.severity = suggestion
92+
dotnet_naming_rule.static_fields_should_be_camel_case.symbols = static_fields
93+
dotnet_naming_rule.static_fields_should_be_camel_case.style = static_field_style
94+
95+
dotnet_naming_symbols.static_fields.applicable_kinds = field
96+
dotnet_naming_symbols.static_fields.required_modifiers = static
97+
98+
dotnet_naming_style.static_field_style.capitalization = camel_case
99+
dotnet_naming_style.static_field_style.required_prefix = _
100+
101+
# Instance fields are camelCase and start with _
102+
dotnet_naming_rule.instance_fields_should_be_camel_case.severity = suggestion
103+
dotnet_naming_rule.instance_fields_should_be_camel_case.symbols = instance_fields
104+
dotnet_naming_rule.instance_fields_should_be_camel_case.style = instance_field_style
105+
106+
dotnet_naming_symbols.instance_fields.applicable_kinds = field
107+
108+
dotnet_naming_style.instance_field_style.capitalization = camel_case
109+
dotnet_naming_style.instance_field_style.required_prefix = _
110+
111+
# Locals and parameters are camelCase
112+
dotnet_naming_rule.locals_should_be_camel_case.severity = suggestion
113+
dotnet_naming_rule.locals_should_be_camel_case.symbols = locals_and_parameters
114+
dotnet_naming_rule.locals_should_be_camel_case.style = camel_case_style
115+
116+
dotnet_naming_symbols.locals_and_parameters.applicable_kinds = parameter, local
117+
118+
dotnet_naming_style.camel_case_style.capitalization = camel_case
119+
120+
# Local functions are PascalCase
121+
dotnet_naming_rule.local_functions_should_be_pascal_case.severity = suggestion
122+
dotnet_naming_rule.local_functions_should_be_pascal_case.symbols = local_functions
123+
dotnet_naming_rule.local_functions_should_be_pascal_case.style = local_function_style
124+
125+
dotnet_naming_symbols.local_functions.applicable_kinds = local_function
126+
127+
dotnet_naming_style.local_function_style.capitalization = pascal_case
128+
129+
# By default, name items with PascalCase
130+
dotnet_naming_rule.members_should_be_pascal_case.severity = suggestion
131+
dotnet_naming_rule.members_should_be_pascal_case.symbols = all_members
132+
dotnet_naming_rule.members_should_be_pascal_case.style = pascal_case_style
133+
134+
dotnet_naming_symbols.all_members.applicable_kinds = *
135+
136+
dotnet_naming_style.pascal_case_style.capitalization = pascal_case
137+
138+
###############################
139+
# C# Coding Conventions #
140+
###############################
141+
142+
[*.cs]
143+
# var preferences
144+
csharp_style_var_for_built_in_types = true:silent
145+
csharp_style_var_when_type_is_apparent = true:silent
146+
csharp_style_var_elsewhere = true:silent
147+
# Expression-bodied members
148+
csharp_style_expression_bodied_methods = false:silent
149+
csharp_style_expression_bodied_constructors = false:silent
150+
csharp_style_expression_bodied_operators = false:silent
151+
csharp_style_expression_bodied_properties = true:silent
152+
csharp_style_expression_bodied_indexers = true:silent
153+
csharp_style_expression_bodied_accessors = true:silent
154+
# Pattern matching preferences
155+
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
156+
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
157+
# Null-checking preferences
158+
csharp_style_throw_expression = true:suggestion
159+
csharp_style_conditional_delegate_call = true:suggestion
160+
# Modifier preferences
161+
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
162+
# Expression-level preferences
163+
csharp_prefer_braces = true:silent
164+
csharp_style_deconstructed_variable_declaration = true:suggestion
165+
csharp_prefer_simple_default_expression = true:suggestion
166+
csharp_style_pattern_local_over_anonymous_function = true:suggestion
167+
csharp_style_inlined_variable_declaration = true:suggestion
168+
169+
###############################
170+
# C# Formatting Rules #
171+
###############################
172+
173+
# New line preferences
174+
csharp_new_line_before_open_brace = all
175+
csharp_new_line_before_else = true
176+
csharp_new_line_before_catch = true
177+
csharp_new_line_before_finally = true
178+
csharp_new_line_before_members_in_object_initializers = true
179+
csharp_new_line_before_members_in_anonymous_types = true
180+
csharp_new_line_between_query_expression_clauses = true
181+
# Indentation preferences
182+
csharp_indent_case_contents = true
183+
csharp_indent_switch_labels = true
184+
csharp_indent_labels = flush_left
185+
# Space preferences
186+
csharp_space_after_cast = false
187+
csharp_space_after_keywords_in_control_flow_statements = true
188+
csharp_space_between_method_call_parameter_list_parentheses = false
189+
csharp_space_between_method_declaration_parameter_list_parentheses = false
190+
csharp_space_between_parentheses = false
191+
csharp_space_before_colon_in_inheritance_clause = true
192+
csharp_space_after_colon_in_inheritance_clause = true
193+
csharp_space_around_binary_operators = before_and_after
194+
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
195+
csharp_space_between_method_call_name_and_opening_parenthesis = false
196+
csharp_space_between_method_call_empty_parameter_list_parentheses = false
197+
# Wrapping preferences
198+
csharp_preserve_single_line_statements = true
199+
csharp_preserve_single_line_blocks = true

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,5 @@ Generated_Code #added for RIA/Silverlight projects
106106
_UpgradeReport_Files/
107107
Backup*/
108108
UpgradeLog*.XML
109+
110+
.vs

MediaBrowser.Plugins.VuPlus.sln

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 15
4-
VisualStudioVersion = 15.0.26730.3
3+
# Visual Studio Version 16
4+
VisualStudioVersion = 16.0.31105.61
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Plugins.VuPlus", "MediaBrowser.Plugins.VuPlus\MediaBrowser.Plugins.VuPlus.csproj", "{52B1ABDF-09C1-450E-B808-BBA0A9C19848}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MediaBrowser.Plugins.VuPlus", "MediaBrowser.Plugins.VuPlus\MediaBrowser.Plugins.VuPlus.csproj", "{52B1ABDF-09C1-450E-B808-BBA0A9C19848}"
7+
EndProject
8+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A968FB09-8732-407C-8748-6DB383EB5D91}"
9+
ProjectSection(SolutionItems) = preProject
10+
.editorconfig = .editorconfig
11+
EndProjectSection
712
EndProject
813
Global
914
GlobalSection(SolutionConfigurationPlatforms) = preSolution

MediaBrowser.Plugins.VuPlus/Configuration/PluginConfiguration.cs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
using System;
21
using MediaBrowser.Model.Plugins;
32

43
namespace MediaBrowser.Plugins.VuPlus.Configuration
@@ -13,24 +12,24 @@ public class PluginConfiguration : BasePluginConfiguration
1312
public string WebInterfacePort { get; set; }
1413
public string WebInterfaceUsername { get; set; }
1514
public string WebInterfacePassword { get; set; }
16-
public Boolean UseSecureHTTPS { get; set; }
17-
public Boolean OnlyOneBouquet { get; set; }
15+
public bool UseSecureHTTPS { get; set; }
16+
public bool OnlyOneBouquet { get; set; }
1817
public string TVBouquet { get; set; }
19-
public Boolean ZapToChannel { get; set; }
20-
public Boolean FetchPiconsFromWebInterface { get; set; }
18+
public bool ZapToChannel { get; set; }
19+
public bool FetchPiconsFromWebInterface { get; set; }
2120
public string PiconsPath { get; set; }
2221

2322
public string RecordingPath { get; set; }
2423

25-
public Boolean EnableDebugLogging { get; set; }
24+
public bool EnableDebugLogging { get; set; }
2625

2726

2827
public PluginConfiguration()
2928
{
3029
HostName = "http://localhost";
3130
StreamingPort = "8001";
3231
WebInterfacePort = "8000";
33-
WebInterfaceUsername= "";
32+
WebInterfaceUsername = "";
3433
WebInterfacePassword = "";
3534
UseSecureHTTPS = false;
3635
OnlyOneBouquet = true;

0 commit comments

Comments
 (0)