alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 01:24:44 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

get channel media info at runtime

Browse Source
This commit is contained in:
Luke Pulverenti
2014-11-18 21:45:12 -05:00
parent 124754a04f
commit dc8c24ed29
21 changed files with 171 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
View File

@@ -453,6 +453,14 @@ namespace MediaBrowser.Server.Implementations.Connect
throw new ArgumentNullException("ConnectServerId");
}
var sendingUser = GetUser(sendingUserId);
var requesterUserName = sendingUser.ConnectUserName;
if (string.IsNullOrWhiteSpace(requesterUserName))
{
throw new ArgumentException("A Connect account is required in order to send invitations.");
}
string connectUserId = null;
var result = new UserLinkResult();
@@ -482,14 +490,6 @@ namespace MediaBrowser.Server.Implementations.Connect
}
}
var sendingUser = GetUser(sendingUserId);
var requesterUserName = sendingUser.ConnectUserName;
if (string.IsNullOrWhiteSpace(requesterUserName))
{
requesterUserName = sendingUser.Name;
}
if (string.IsNullOrWhiteSpace(connectUserId))
{
return await SendNewUserInvitation(requesterUserName, connectUsername).ConfigureAwait(false);
@@ -781,6 +781,7 @@ namespace MediaBrowser.Server.Implementations.Connect
user.Configuration.EnableLiveTvManagement = false;
user.Configuration.EnableContentDeletion = false;
user.Configuration.EnableRemoteControlOfOtherUsers = false;
user.Configuration.EnableSharedDeviceControl = false;
user.Configuration.IsAdministrator = false;
if (currentPendingEntry != null)

5
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@@ -631,5 +631,8 @@
"MessageForgotPasswordFileCreated": "The following file has been created on your server and contains instructions on how to proceed:",
"MessageForgotPasswordFileExpiration": "The reset pin will expire at {0}.",
"MessageInvalidForgotPasswordPin": "An invalid or expired pin was entered. Please try again.",
"MessagePasswordResetForUsers": "Passwords have been reset for the following users:"
"MessagePasswordResetForUsers": "Passwords have been reset for the following users:",
"HeaderInviteGuest": "Invite Guest",
"ButtonLinkMyMediaBrowserAccount": "Link my account now",
"MessageConnectAccountRequiredToInviteGuest": "In order to invite guests you need to first link your Media Browser account to this server."
}

7
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@@ -145,7 +145,7 @@
"OptionBudget": "Budget",
"OptionRevenue": "Revenue",
"OptionPoster": "Poster",
"OptionPosterCard": "Poster card",
"OptionPosterCard": "Poster card",
"OptionBackdrop": "Backdrop",
"OptionTimeline": "Timeline",
"OptionThumb": "Thumb",
@@ -234,6 +234,9 @@
"OptionAllowDeleteLibraryContent": "Allow this user to delete library content",
"OptionAllowManageLiveTv": "Allow management of live tv recordings",
"OptionAllowRemoteControlOthers": "Allow this user to remote control other users",
"OptionAllowRemoteSharedDevices": "Allow this user to remote control shared devices",
"OptionAllowRemoteSharedDevicesHelp": "Dlna devices are considered shared until a user begins controlling it.",
"HeaderRemoteControl": "Remote Control",
"OptionMissingTmdbId": "Missing Tmdb Id",
"OptionIsHD": "HD",
"OptionIsSD": "SD",
@@ -1237,7 +1240,7 @@
"LabelConnectGuestUserNameHelp": "This is the username that your friend uses to sign in to the Media Browser website, or their email address.",
"HeaderInviteUserHelp": "Sharing your media with friends is easier than ever before with Media Browser Connect.",
"ButtonSendInvitation": "Send Invitation",
"HeaderSignInWithConnect": "Sign in with Media Browser Connect",
"HeaderSignInWithConnect": "Sign in with Media Browser Connect",
"HeaderGuests": "Guests",
"HeaderLocalUsers": "Local Users",
"HeaderPendingInvitations": "Pending Invitations",

2
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
View File

@@ -51,7 +51,7 @@
</Reference>
<Reference Include="MediaBrowser.Naming, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\MediaBrowser.Naming.1.0.0.6\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
<HintPath>..\packages\MediaBrowser.Naming.1.0.0.7\lib\portable-net45+sl4+wp71+win8+wpa81\MediaBrowser.Naming.dll</HintPath>
</Reference>
<Reference Include="Mono.Nat, Version=1.2.21.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>

2
MediaBrowser.Server.Implementations/packages.config
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.Naming" version="1.0.0.6" targetFramework="net45" />
<package id="MediaBrowser.Naming" version="1.0.0.7" targetFramework="net45" />
<package id="Mono.Nat" version="1.2.21.0" targetFramework="net45" />
<package id="morelinq" version="1.1.0" targetFramework="net45" />
</packages>