Skip to content

Commit

Permalink
update web socket sharp
Browse files Browse the repository at this point in the history
  • Loading branch information
@LukePulverenti
LukePulverenti committed Sep 15, 2014
1 parent d1bf61f commit b215230
Show file tree
Hide file tree
Showing 5 changed files with 44 additions and 35 deletions.
11 changes: 4 additions & 7 deletions MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
View file
Expand Up @@ -78,6 +78,8 @@ private void Listen()
// Handle the processing of a request in here.
private void ListenerCallback(IAsyncResult asyncResult)
{
_listenForNextRequest.Set();

var listener = asyncResult.AsyncState as HttpListener;
HttpListenerContext context;

Expand All @@ -88,8 +90,7 @@ private void ListenerCallback(IAsyncResult asyncResult)
{
if (!isListening)
{
_logger.Debug("Ignoring ListenerCallback() as HttpListener is no longer listening");
return;
_logger.Debug("Ignoring ListenerCallback() as HttpListener is no longer listening"); return;
}
// The EndGetContext() method, as with all Begin/End asynchronous methods in the .NET Framework,
// blocks until there is a request to be processed or some type of data is available.
Expand All @@ -105,10 +106,6 @@ private void ListenerCallback(IAsyncResult asyncResult)
_logger.Warn(errMsg);
return;
}
finally
{
_listenForNextRequest.Set();
}

Task.Factory.StartNew(() => InitTask(context));
}
Expand Down Expand Up @@ -268,4 +265,4 @@ protected virtual void Dispose(bool disposing)
}
}
}
}
}
7 changes: 6 additions & 1 deletion MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View file
Expand Up @@ -457,5 +457,10 @@
"MessagePendingMediaBrowserAccountAdded": "The Media Browser account has been added to this user. An email will be sent to the owner of the account. The invitation will need to be confirmed by clicking a link within the email.",
"HeaderMediaBrowserAccountRemoved": "Media Browser Account Removed",
"MessageMediaBrowserAccontRemoved": "The Media Browser account has been removed from this user.",
"TooltipLinkedToMediaBrowserConnect": "Linked to Media Browser Connect"
"TooltipLinkedToMediaBrowserConnect": "Linked to Media Browser Connect",
"HeaderUnrated": "Unrated",
"ValueDiscNumber": "Disc {0}",
"HeaderUnknownDate": "Unknown Date",
"HeaderUnknownYear": "Unknown Year",
"ValueMinutes": "{0} min"
}
9 changes: 8 additions & 1 deletion MediaBrowser.WebDashboard/dashboard-ui/scripts/extensions.js
View file
Expand Up @@ -513,8 +513,15 @@ function ticks_to_human(str) {
window.Globalize = {
translate: function (key) {

return window.localizationGlossary[key] || key;
var val = window.localizationGlossary[key] || key;

for (var i = 1; i < arguments.length; i++) {

val = val.replace('{' + (i - 1) + '}', arguments[i]);

}

return val;
}
};

Expand Down
52 changes: 26 additions & 26 deletions MediaBrowser.WebDashboard/dashboard-ui/scripts/librarybrowser.js
View file
Expand Up @@ -145,10 +145,10 @@

minutes = minutes || 1;

childText += Math.round(minutes) + " min";
childText += Globalize.translate('ValueMinutes', Math.round(minutes));

} else {
childText += '0 min';
childText += Globalize.translate('ValueMinutes', 0);
}

//childText += item.ChildCount == 1 ? "1 item" : item.ChildCount + " items";
Expand Down Expand Up @@ -248,28 +248,28 @@
var html = '<div data-role="popup" class="playFlyout" data-history="false" data-theme="a">';

html += '<ul data-role="listview" style="min-width: 180px;">';
html += '<li data-role="list-divider">Menu</li>';
html += '<li data-role="list-divider">' + Globalize.translate('HeaderMenu') + '</li>';

html += '<li><a href="#" onclick="MediaController.play(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Play</a></li>';
html += '<li><a href="#" onclick="MediaController.play(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">' + Globalize.translate('ButtonPlay') + '</a></li>';

if (resumePositionTicks) {
html += '<li><a href="#" onclick="MediaController.play({ids:[\'' + itemId + '\'],startPositionTicks:' + resumePositionTicks + '});LibraryBrowser.closePlayMenu();">Resume</a></li>';
html += '<li><a href="#" onclick="MediaController.play({ids:[\'' + itemId + '\'],startPositionTicks:' + resumePositionTicks + '});LibraryBrowser.closePlayMenu();">' + Globalize.translate('ButtonResume') + '</a></li>';
}

if (MediaController.canQueueMediaType(mediaType, itemType)) {
html += '<li><a href="#" onclick="MediaController.queue(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Queue</a></li>';
html += '<li><a href="#" onclick="MediaController.queue(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">' + Globalize.translate('ButtonQueue') + '</a></li>';
}

if (itemType == "Audio" || itemType == "MusicAlbum" || itemType == "MusicArtist" || itemType == "MusicGenre") {
html += '<li><a href="#" onclick="MediaController.instantMix(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Instant Mix</a></li>';
html += '<li><a href="#" onclick="MediaController.instantMix(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">' + Globalize.translate('ButtonInstantMix') + '</a></li>';
}

if (isFolder || itemType == "MusicArtist" || itemType == "MusicGenre") {
html += '<li><a href="#" onclick="MediaController.shuffle(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">Shuffle</a></li>';
html += '<li><a href="#" onclick="MediaController.shuffle(\'' + itemId + '\');LibraryBrowser.closePlayMenu();">' + Globalize.translate('ButtonShuffle') + '</a></li>';
}

if (showAddToPlaylist) {
html += '<li><a href="#" onclick="PlaylistManager.showPanel([\'' + itemId + '\']);LibraryBrowser.closePlayMenu();">Add to playlist</a></li>';
html += '<li><a href="#" onclick="PlaylistManager.showPanel([\'' + itemId + '\']);LibraryBrowser.closePlayMenu();">' + Globalize.translate('ButtonAddToPlaylist') + '</a></li>';
}

html += '</ul>';
Expand Down Expand Up @@ -313,14 +313,14 @@
var html = '<div data-role="popup" class="playFlyout" data-history="false" data-theme="a">';

html += '<ul data-role="listview" style="min-width: 180px;">';
html += '<li data-role="list-divider">Menu</li>';
html += '<li data-role="list-divider">' + Globalize.translate('HeaderMenu') + '</li>';

if (commands.indexOf('playlist') != -1) {
html += '<li><a href="#" onclick="$(\'.playFlyout\').popup(\'close\');PlaylistManager.showPanel([\'' + itemId + '\']);">Add to playlist</a></li>';
html += '<li><a href="#" onclick="$(\'.playFlyout\').popup(\'close\');PlaylistManager.showPanel([\'' + itemId + '\']);">' + Globalize.translate('ButtonAddToPlaylist') + '</a></li>';
}

if (commands.indexOf('edit') != -1) {
html += '<li><a href="edititemmetadata.html?id=' + itemId + '">Edit</a></li>';
html += '<li><a href="edititemmetadata.html?id=' + itemId + '">' + Globalize.translate('ButtonEdit') + '</a></li>';
}

html += '</ul>';
Expand Down Expand Up @@ -499,7 +499,7 @@

if (options.index == 'disc') {

return item.ParentIndexNumber == null ? '' : 'Disc ' + item.ParentIndexNumber;
return item.ParentIndexNumber == null ? '' : Globalize.translate('ValueDiscNumber', item.ParentIndexNumber);
}

var sortBy = (options.sortBy || '').toLowerCase();
Expand All @@ -521,28 +521,28 @@
}
if (sortBy.indexOf('officialrating') == 0) {

return item.OfficialRating || 'Unrated';
return item.OfficialRating || Globalize.translate('HeaderUnrated');
}
if (sortBy.indexOf('communityrating') == 0) {

if (item.CommunityRating == null) {
return 'Unrated';
return Globalize.translate('HeaderUnrated');
}

return Math.floor(item.CommunityRating);
}
if (sortBy.indexOf('criticrating') == 0) {

if (item.CriticRating == null) {
return 'Unrated';
return Globalize.translate('HeaderUnrated');
}

return Math.floor(item.CriticRating);
}
if (sortBy.indexOf('metascore') == 0) {

if (item.Metascore == null) {
return 'Unrated';
return Globalize.translate('HeaderUnrated');
}

return Math.floor(item.Metascore);
Expand Down Expand Up @@ -683,9 +683,9 @@
var textlines = [];

if (item.Type == 'Episode') {
textlines.push(item.SeriesName || 'Unknown Series');
textlines.push(item.SeriesName || '&nbsp;');
} else if (item.Type == 'MusicAlbum') {
textlines.push(item.AlbumArtist || 'Unknown Artist');
textlines.push(item.AlbumArtist || '&nbsp;');
}

var displayName = LibraryBrowser.getPosterViewDisplayName(item);
Expand All @@ -696,18 +696,18 @@
textlines.push(displayName);

if (item.Type == 'Audio') {
textlines.push(item.Artists.join(', ') || 'Unknown Artist');
textlines.push(item.Artists.join(', ') || '&nbsp;');
}

if (item.Type == 'Game') {
textlines.push(item.GameSystem || 'Unknown Game System');
textlines.push(item.GameSystem || '&nbsp;');
}

else if (item.Type == 'MusicGenre') {
textlines.push('Music genre');
textlines.push('&nbsp;');
}
else if (item.Type == 'MusicArtist') {
textlines.push('Music artist');
textlines.push('&nbsp;');
}
else {
textlines.push(LibraryBrowser.getMiscInfoHtml(item));
Expand Down Expand Up @@ -874,15 +874,15 @@

if (options.showPremiereDateIndex && futureDateText) {

var val = futureDateText || "Unknown Date";
var val = futureDateText || Globalize.translate('HeaderUnknownDate');

if (val != currentIndexValue) {

html += '<h2 class="timelineHeader detailSectionHeader" style="text-align:center;">' + val + '</h2>';
currentIndexValue = val;
}
} else if (options.timeline) {
var year = item.ProductionYear || "Unknown Year";
var year = item.ProductionYear || Globalize.translate('HeaderUnknownYear');

if (year != currentIndexValue) {

Expand Down Expand Up @@ -1257,7 +1257,7 @@

if (progressHtml) {
html += "<div class='cardText cardProgress'>";
html += progressHtml || "&nbsp;";
html += progressHtml;
html += "</div>";
}
}
Expand Down
Binary file modified ThirdParty/WebsocketSharp/websocket-sharp.dll
View file
Binary file not shown.

0 comments on commit b215230

Please sign in to comment.