alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-12 05:12:23 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge pull request #383 from Bond-009/unused

Browse Source 
Remove firebase and empty resource config file
This commit is contained in:
Anthony Lavado
2019-01-05 23:06:08 +00:00
committed by GitHub
parent af6c4279ee db62648510
commit f2fedb9f34
7 changed files with 11 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
Emby.Server.Implementations/ApplicationHost.cs
View File

@@ -2407,53 +2407,6 @@ namespace Emby.Server.Implementations
}
}
}
private Dictionary<string, string> _values;
public string GetValue(string name)
{
if (_values == null)
{
_values = LoadValues();
}
string value;
if (_values.TryGetValue(name, out value))
{
return value;
}
return null;
}
// TODO: @bond Remove?
private Dictionary<string, string> LoadValues()
{
Dictionary<string, string> values = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
using (var stream = typeof(ApplicationHost).Assembly.GetManifestResourceStream(typeof(ApplicationHost).Namespace + ".values.txt"))
{
using (var reader = new StreamReader(stream))
{
while (!reader.EndOfStream)
{
var line = reader.ReadLine();
if (string.IsNullOrEmpty(line))
{
continue;
}
var index = line.IndexOf('=');
if (index != -1)
{
values[line.Substring(0, index)] = line.Substring(index + 1);
}
}
}
}
return values;
}
}
internal class CertificateInfo

131
Emby.Server.Implementations/Session/FirebaseSessionController.cs
View File

@@ -1,131 +0,0 @@
using MediaBrowser.Controller.Session;
using MediaBrowser.Model.Net;
using MediaBrowser.Common.Net;
using MediaBrowser.Model.Serialization;
using System;
using System.Threading;
using System.Threading.Tasks;
using System.Text;
using MediaBrowser.Common;
namespace Emby.Server.Implementations.Session
{
public class FirebaseSessionController : ISessionController
{
private readonly IHttpClient _httpClient;
private readonly IJsonSerializer _json;
private readonly ISessionManager _sessionManager;
public SessionInfo Session { get; private set; }
private readonly string _token;
private IApplicationHost _appHost;
private string _senderId;
private string _applicationId;
public FirebaseSessionController(IHttpClient httpClient,
IApplicationHost appHost,
IJsonSerializer json,
SessionInfo session,
string token, ISessionManager sessionManager)
{
_httpClient = httpClient;
_json = json;
_appHost = appHost;
Session = session;
_token = token;
_sessionManager = sessionManager;
_applicationId = _appHost.GetValue("firebase_applicationid");
_senderId = _appHost.GetValue("firebase_senderid");
}
public static bool IsSupported(IApplicationHost appHost)
{
return !string.IsNullOrEmpty(appHost.GetValue("firebase_applicationid")) && !string.IsNullOrEmpty(appHost.GetValue("firebase_senderid"));
}
public bool IsSessionActive
{
get
{
return (DateTime.UtcNow - Session.LastActivityDate).TotalDays <= 3;
}
}
public bool SupportsMediaControl
{
get { return true; }
}
public async Task SendMessage<T>(string name, string messageId, T data, ISessionController[] allControllers, CancellationToken cancellationToken)
{
if (!IsSessionActive)
{
return;
}
if (string.IsNullOrEmpty(_senderId) || string.IsNullOrEmpty(_applicationId))
{
return;
}
foreach (var controller in allControllers)
{
// Don't send if there's an active web socket connection
if ((controller is WebSocketController) && controller.IsSessionActive)
{
return;
}
}
var msg = new WebSocketMessage<T>
{
Data = data,
MessageType = name,
MessageId = messageId,
ServerId = _appHost.SystemId
};
var req = new FirebaseBody<T>
{
to = _token,
data = msg
};
var byteArray = Encoding.UTF8.GetBytes(_json.SerializeToString(req));
var enableLogging = false;
#if DEBUG
enableLogging = true;
#endif
var options = new HttpRequestOptions
{
Url = "https://fcm.googleapis.com/fcm/send",
RequestContentType = "application/json",
RequestContentBytes = byteArray,
CancellationToken = cancellationToken,
LogRequest = enableLogging,
LogResponse = enableLogging,
LogErrors = enableLogging
};
options.RequestHeaders["Authorization"] = string.Format("key={0}", _applicationId);
options.RequestHeaders["Sender"] = string.Format("id={0}", _senderId);
using (var response = await _httpClient.Post(options).ConfigureAwait(false))
{
}
}
}
internal class FirebaseBody<T>
{
public string to { get; set; }
public WebSocketMessage<T> data { get; set; }
}
}

13
Emby.Server.Implementations/Session/SessionManager.cs
View File

@@ -1574,14 +1574,6 @@ namespace Emby.Server.Implementations.Session
{
session.Capabilities = capabilities;
if (!string.IsNullOrEmpty(capabilities.PushToken))
{
if (string.Equals(capabilities.PushTokenType, "firebase", StringComparison.OrdinalIgnoreCase) && FirebaseSessionController.IsSupported(_appHost))
{
EnsureFirebaseController(session, capabilities.PushToken);
}
}
if (saveCapabilities)
{
CapabilitiesChanged?.Invoke(this, new SessionEventArgs
@@ -1600,11 +1592,6 @@ namespace Emby.Server.Implementations.Session
}
}
private void EnsureFirebaseController(SessionInfo session, string token)
{
session.EnsureController<FirebaseSessionController>(s => new FirebaseSessionController(_httpClient, _appHost, _jsonSerializer, s, token, this));
}
private ClientCapabilities GetSavedCapabilities(string deviceId)
{
return _deviceManager.GetCapabilities(deviceId);