lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' into reformat

Browse Source
This commit is contained in:
Erwin de Haan 2019-01-19 14:45:02 +01:00
commit 1e94023927
3 changed files with 146 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

240
.editorconfig
View File

@ -1,13 +1,13 @@
# With more recent updates Visual Studio 2017 supports EditorConfig files out of the box # 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 # 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 # For emacs, vim, np++ and other editors, see here: https://github.com/editorconfig
############################### ###############################
# Core EditorConfig Options # # Core EditorConfig Options #
############################### ###############################
root = true root = true
# All files # All files
[*] [*]
indent_style = space indent_style = space
indent_size = 4 indent_size = 4
charset = utf-8 charset = utf-8
trim_trailing_whitespace = true trim_trailing_whitespace = true
@ -15,119 +15,117 @@ insert_final_newline = true
end_of_line = lf end_of_line = lf
max_line_length = null max_line_length = null
# Code files # XML indentation
[*.{cs,csx,vb,vbx}] [*.{csproj,xml}]
indent_size = 4 indent_size = 2
insert_final_newline = true ###############################
charset = utf-8 # .NET Coding Conventions #
############################### ###############################
# .NET Coding Conventions # [*.{cs,vb}]
############################### # Organize usings
[*.{cs,vb}] dotnet_sort_system_directives_first = true
# Organize usings # this. preferences
dotnet_sort_system_directives_first = true dotnet_style_qualification_for_field = false:silent
# this. preferences dotnet_style_qualification_for_property = false:silent
dotnet_style_qualification_for_field = false:silent dotnet_style_qualification_for_method = false:silent
dotnet_style_qualification_for_property = false:silent dotnet_style_qualification_for_event = false:silent
dotnet_style_qualification_for_method = false:silent # Language keywords vs BCL types preferences
dotnet_style_qualification_for_event = false:silent dotnet_style_predefined_type_for_locals_parameters_members = true:silent
# Language keywords vs BCL types preferences dotnet_style_predefined_type_for_member_access = true:silent
dotnet_style_predefined_type_for_locals_parameters_members = true:silent # Parentheses preferences
dotnet_style_predefined_type_for_member_access = true:silent dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
# Parentheses preferences dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent # Modifier preferences
dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent
# Modifier preferences dotnet_style_readonly_field = true:suggestion
dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent # Expression-level preferences
dotnet_style_readonly_field = true:suggestion dotnet_style_object_initializer = true:suggestion
# Expression-level preferences dotnet_style_collection_initializer = true:suggestion
dotnet_style_object_initializer = true:suggestion dotnet_style_explicit_tuple_names = true:suggestion
dotnet_style_collection_initializer = true:suggestion dotnet_style_null_propagation = true:suggestion
dotnet_style_explicit_tuple_names = true:suggestion dotnet_style_coalesce_expression = true:suggestion
dotnet_style_null_propagation = true:suggestion dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent
dotnet_style_coalesce_expression = true:suggestion dotnet_prefer_inferred_tuple_names = true:suggestion
dotnet_style_prefer_is_null_check_over_reference_equality_method = true:silent dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion
dotnet_prefer_inferred_tuple_names = true:suggestion dotnet_style_prefer_auto_properties = true:silent
dotnet_prefer_inferred_anonymous_type_member_names = true:suggestion dotnet_style_prefer_conditional_expression_over_assignment = true:silent
dotnet_style_prefer_auto_properties = true:silent dotnet_style_prefer_conditional_expression_over_return = true:silent
dotnet_style_prefer_conditional_expression_over_assignment = true:silent ###############################
dotnet_style_prefer_conditional_expression_over_return = true:silent # Naming Conventions #
############################### ###############################
# Naming Conventions # # Style Definitions
############################### dotnet_naming_style.pascal_case_style.capitalization = pascal_case
# Style Definitions # Use PascalCase for constant fields
dotnet_naming_style.pascal_case_style.capitalization = pascal_case dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion
# Use PascalCase for constant fields dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields
dotnet_naming_rule.constant_fields_should_be_pascal_case.severity = suggestion dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style
dotnet_naming_rule.constant_fields_should_be_pascal_case.symbols = constant_fields dotnet_naming_symbols.constant_fields.applicable_kinds = field
dotnet_naming_rule.constant_fields_should_be_pascal_case.style = pascal_case_style dotnet_naming_symbols.constant_fields.applicable_accessibilities = *
dotnet_naming_symbols.constant_fields.applicable_kinds = field dotnet_naming_symbols.constant_fields.required_modifiers = const
dotnet_naming_symbols.constant_fields.applicable_accessibilities = * ###############################
dotnet_naming_symbols.constant_fields.required_modifiers = const # C# Coding Conventions #
############################### ###############################
# C# Coding Conventions # [*.cs]
############################### # var preferences
[*.cs] csharp_style_var_for_built_in_types = true:silent
# var preferences csharp_style_var_when_type_is_apparent = true:silent
csharp_style_var_for_built_in_types = true:silent csharp_style_var_elsewhere = true:silent
csharp_style_var_when_type_is_apparent = true:silent # Expression-bodied members
csharp_style_var_elsewhere = true:silent csharp_style_expression_bodied_methods = false:silent
# Expression-bodied members csharp_style_expression_bodied_constructors = false:silent
csharp_style_expression_bodied_methods = false:silent csharp_style_expression_bodied_operators = false:silent
csharp_style_expression_bodied_constructors = false:silent csharp_style_expression_bodied_properties = true:silent
csharp_style_expression_bodied_operators = false:silent csharp_style_expression_bodied_indexers = true:silent
csharp_style_expression_bodied_properties = true:silent csharp_style_expression_bodied_accessors = true:silent
csharp_style_expression_bodied_indexers = true:silent # Pattern matching preferences
csharp_style_expression_bodied_accessors = true:silent csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
# Pattern matching preferences csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion # Null-checking preferences
csharp_style_pattern_matching_over_as_with_null_check = true:suggestion csharp_style_throw_expression = true:suggestion
# Null-checking preferences csharp_style_conditional_delegate_call = true:suggestion
csharp_style_throw_expression = true:suggestion # Modifier preferences
csharp_style_conditional_delegate_call = true:suggestion csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion
# Modifier preferences # Expression-level preferences
csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async:suggestion csharp_prefer_braces = true:silent
# Expression-level preferences csharp_style_deconstructed_variable_declaration = true:suggestion
csharp_prefer_braces = true:silent csharp_prefer_simple_default_expression = true:suggestion
csharp_style_deconstructed_variable_declaration = true:suggestion csharp_style_pattern_local_over_anonymous_function = true:suggestion
csharp_prefer_simple_default_expression = true:suggestion csharp_style_inlined_variable_declaration = true:suggestion
csharp_style_pattern_local_over_anonymous_function = true:suggestion ###############################
csharp_style_inlined_variable_declaration = true:suggestion # C# Formatting Rules #
############################### ###############################
# C# Formatting Rules # # New line preferences
############################### csharp_new_line_before_open_brace = all
# New line preferences csharp_new_line_before_else = true
csharp_new_line_before_open_brace = all csharp_new_line_before_catch = true
csharp_new_line_before_else = true csharp_new_line_before_finally = true
csharp_new_line_before_catch = true csharp_new_line_before_members_in_object_initializers = true
csharp_new_line_before_finally = true csharp_new_line_before_members_in_anonymous_types = true
csharp_new_line_before_members_in_object_initializers = true csharp_new_line_between_query_expression_clauses = true
csharp_new_line_before_members_in_anonymous_types = true # Indentation preferences
csharp_new_line_between_query_expression_clauses = true csharp_indent_case_contents = true
# Indentation preferences csharp_indent_switch_labels = true
csharp_indent_case_contents = true csharp_indent_labels = flush_left
csharp_indent_switch_labels = true # Space preferences
csharp_indent_labels = flush_left csharp_space_after_cast = false
# Space preferences csharp_space_after_keywords_in_control_flow_statements = true
csharp_space_after_cast = false csharp_space_between_method_call_parameter_list_parentheses = false
csharp_space_after_keywords_in_control_flow_statements = true csharp_space_between_method_declaration_parameter_list_parentheses = false
csharp_space_between_method_call_parameter_list_parentheses = false csharp_space_between_parentheses = false
csharp_space_between_method_declaration_parameter_list_parentheses = false csharp_space_before_colon_in_inheritance_clause = true
csharp_space_between_parentheses = false csharp_space_after_colon_in_inheritance_clause = true
csharp_space_before_colon_in_inheritance_clause = true csharp_space_around_binary_operators = before_and_after
csharp_space_after_colon_in_inheritance_clause = true csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
csharp_space_around_binary_operators = before_and_after csharp_space_between_method_call_name_and_opening_parenthesis = false
csharp_space_between_method_declaration_empty_parameter_list_parentheses = false csharp_space_between_method_call_empty_parameter_list_parentheses = false
csharp_space_between_method_call_name_and_opening_parenthesis = false # Wrapping preferences
csharp_space_between_method_call_empty_parameter_list_parentheses = false csharp_preserve_single_line_statements = true
# Wrapping preferences csharp_preserve_single_line_blocks = true
csharp_preserve_single_line_statements = true ###############################
csharp_preserve_single_line_blocks = true # VB Coding Conventions #
############################### ###############################
# VB Coding Conventions # [*.vb]
############################### # Modifier preferences
[*.vb] visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion
# Modifier preferences
visual_basic_preferred_modifier_order = Partial,Default,Private,Protected,Public,Friend,NotOverridable,Overridable,MustOverride,Overloads,Overrides,MustInherit,NotInheritable,Static,Shared,Shadows,ReadOnly,WriteOnly,Dim,Const,WithEvents,Widening,Narrowing,Custom,Async:suggestion

4
Dockerfile
View File

@ -26,9 +26,11 @@ COPY --from=builder /jellyfin /jellyfin
COPY --from=ffmpeg /ffmpeg-bin/* /usr/bin/ COPY --from=ffmpeg /ffmpeg-bin/* /usr/bin/
EXPOSE 8096 EXPOSE 8096
VOLUME /config /media VOLUME /config /media
# libfontconfig1 is required for Skia
RUN apt-get update \ RUN apt-get update \
&& apt-get install --no-install-recommends --no-install-suggests -y \ && apt-get install --no-install-recommends --no-install-suggests -y \
libfontconfig1 # Required for Skia \ libfontconfig1 \
&& apt-get clean autoclean \ && apt-get clean autoclean \
&& apt-get autoremove \ && apt-get autoremove \
&& rm -rf /var/lib/{apt,dpkg,cache,log} && rm -rf /var/lib/{apt,dpkg,cache,log}

28
Jellyfin.Server/Program.cs
View File

@ -45,7 +45,8 @@ namespace Jellyfin.Server
Console.WriteLine(version.ToString()); Console.WriteLine(version.ToString());
} }
ServerApplicationPaths appPaths = createApplicationPaths(options); ServerApplicationPaths appPaths = CreateApplicationPaths(options);
// $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager // $JELLYFIN_LOG_DIR needs to be set for the logger configuration manager
Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", appPaths.LogDirectoryPath); Environment.SetEnvironmentVariable("JELLYFIN_LOG_DIR", appPaths.LogDirectoryPath);
await createLogger(appPaths); await createLogger(appPaths);
@ -130,7 +131,7 @@ namespace Jellyfin.Server
} }
} }
private static ServerApplicationPaths createApplicationPaths(StartupOptions options) private static ServerApplicationPaths CreateApplicationPaths(StartupOptions options)
{ {
string programDataPath = Environment.GetEnvironmentVariable("JELLYFIN_DATA_PATH"); string programDataPath = Environment.GetEnvironmentVariable("JELLYFIN_DATA_PATH");
if (string.IsNullOrEmpty(programDataPath)) if (string.IsNullOrEmpty(programDataPath))
@ -155,12 +156,21 @@ namespace Jellyfin.Server
programDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share"); programDataPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share");
} }
} }
programDataPath = Path.Combine(programDataPath, "jellyfin"); programDataPath = Path.Combine(programDataPath, "jellyfin");
// Ensure the dir exists
Directory.CreateDirectory(programDataPath);
} }
} }
if (string.IsNullOrEmpty(programDataPath))
{
Console.WriteLine("Cannot continue without path to program data folder (try -programdata)");
Environment.Exit(1);
}
else
{
Directory.CreateDirectory(programDataPath);
}
string configDir = Environment.GetEnvironmentVariable("JELLYFIN_CONFIG_DIR"); string configDir = Environment.GetEnvironmentVariable("JELLYFIN_CONFIG_DIR");
if (string.IsNullOrEmpty(configDir)) if (string.IsNullOrEmpty(configDir))
{ {
@ -175,6 +185,11 @@ namespace Jellyfin.Server
} }
} }
if (configDir != null)
{
Directory.CreateDirectory(configDir);
}
string logDir = Environment.GetEnvironmentVariable("JELLYFIN_LOG_DIR"); string logDir = Environment.GetEnvironmentVariable("JELLYFIN_LOG_DIR");
if (string.IsNullOrEmpty(logDir)) if (string.IsNullOrEmpty(logDir))
{ {
@ -189,6 +204,11 @@ namespace Jellyfin.Server
} }
} }
if (logDir != null)
{
Directory.CreateDirectory(logDir);
}
string appPath = AppContext.BaseDirectory; string appPath = AppContext.BaseDirectory;
return new ServerApplicationPaths(programDataPath, appPath, appPath, logDir, configDir); return new ServerApplicationPaths(programDataPath, appPath, appPath, logDir, configDir);