mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
easier user library setup
This commit is contained in:
Luke Pulverenti
parent
990e9a39c6
commit
22f629080c
16 changed files with 108 additions and 161 deletions
|
|
@ -69,21 +69,25 @@
|
|||
|
||||
function loadChildrenOfRootNode(callback) {
|
||||
|
||||
|
||||
var promise1 = ApiClient.getRootFolder(Dashboard.getCurrentUserId());
|
||||
var promise1 = $.getJSON(ApiClient.getUrl("Library/MediaFolders"));
|
||||
|
||||
var promise2 = ApiClient.getLiveTvInfo();
|
||||
|
||||
$.when(promise1, promise2).done(function (response1, response2) {
|
||||
|
||||
var rootFolder = response1[0];
|
||||
var mediaFolders = response1[0].Items;
|
||||
var liveTvInfo = response2[0];
|
||||
|
||||
var nodes = [];
|
||||
|
||||
nodes.push(getNode(rootFolder, 'open'));
|
||||
var i, length;
|
||||
|
||||
for (var i = 0, length = liveTvInfo.Services.length; i < length; i++) {
|
||||
for (i = 0, length = mediaFolders.length; i < length; i++) {
|
||||
|
||||
nodes.push(getNode(mediaFolders[i], 'closed'));
|
||||
}
|
||||
|
||||
for (i = 0, length = liveTvInfo.Services.length; i < length; i++) {
|
||||
|
||||
var service = liveTvInfo.Services[i];
|
||||
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@
|
|||
|
||||
Dashboard.getCurrentUser().done(function (user) {
|
||||
|
||||
if (user.Configuration.IsAdministrator) {
|
||||
if (user.Configuration.IsAdministrator && query.ParentId) {
|
||||
$('#editButtonContainer', page).show();
|
||||
} else {
|
||||
$('#editButtonContainer', page).hide();
|
||||
|
|
|
|||
|
|
@ -1,10 +1,19 @@
|
|||
var LoginPage = {
|
||||
|
||||
onPageShow: function () {
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
var isLocalhost = window.location.toString().toLowerCase().indexOf('localhost') != -1;
|
||||
|
||||
if (isLocalhost) {
|
||||
$('.localhostMessage', this).show();
|
||||
} else {
|
||||
$('.localhostMessage', this).hide();
|
||||
}
|
||||
|
||||
// Show all users on localhost
|
||||
var promise1 = window.location.toString().toLowerCase().indexOf('localhost') == -1 ? ApiClient.getPublicUsers() : ApiClient.getUsers({ IsDisabled: false });
|
||||
var promise1 = !isLocalhost ? ApiClient.getPublicUsers() : ApiClient.getUsers({ IsDisabled: false });
|
||||
var promise2 = ApiClient.getServerConfiguration();
|
||||
|
||||
$.when(promise1, promise2).done(function (response1, response2) {
|
||||
|
|
|
|||
|
|
@ -5,84 +5,20 @@
|
|||
var page = this;
|
||||
MediaLibraryPage.lastVirtualFolderName = "";
|
||||
|
||||
MediaLibraryPage.reloadUsers(page);
|
||||
|
||||
$('#selectUser', page).on('change.reloadLibrary', function() {
|
||||
|
||||
MediaLibraryPage.reloadLibrary(page);
|
||||
|
||||
});
|
||||
MediaLibraryPage.reloadLibrary(page);
|
||||
},
|
||||
|
||||
onPageHide: function() {
|
||||
|
||||
var page = this;
|
||||
$('#selectUser', page).off('click.reloadLibrary');
|
||||
},
|
||||
|
||||
reloadUsers: function (page) {
|
||||
|
||||
ApiClient.getUsers().done(function (users) {
|
||||
|
||||
|
||||
var html = users.map(function (u) {
|
||||
|
||||
return '<option value="' + u.Id + '">' + u.Name + '</option>';
|
||||
|
||||
});
|
||||
|
||||
html = '<option value="">Default Library</option>' + html;
|
||||
|
||||
$('#selectUser', page).html(html).val('').selectmenu('refresh');
|
||||
|
||||
MediaLibraryPage.reloadLibrary(page);
|
||||
});
|
||||
},
|
||||
|
||||
getCurrentUserId: function(page) {
|
||||
|
||||
return $('#selectUser', page).val();
|
||||
},
|
||||
|
||||
reloadLibrary: function (page) {
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
var userId = MediaLibraryPage.getCurrentUserId(page);
|
||||
ApiClient.getVirtualFolders().done(function (result) {
|
||||
MediaLibraryPage.reloadVirtualFolders(page, result);
|
||||
});
|
||||
|
||||
if (userId) {
|
||||
|
||||
ApiClient.getUser(userId).done(function (user) {
|
||||
|
||||
$('#fldUseDefaultLibrary', page).show();
|
||||
|
||||
$('#chkUseDefaultLibrary', page).checked(!user.Configuration.UseCustomLibrary).checkboxradio("refresh");
|
||||
|
||||
if (user.Configuration.UseCustomLibrary) {
|
||||
|
||||
ApiClient.getVirtualFolders(userId).done(function (result) {
|
||||
MediaLibraryPage.reloadVirtualFolders(page, result);
|
||||
});
|
||||
|
||||
$(".editing_default", page).hide();
|
||||
$('#divMediaLibrary', page).show();
|
||||
} else {
|
||||
$('#divMediaLibrary', page).hide();
|
||||
Dashboard.hideLoadingMsg();
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
} else {
|
||||
|
||||
ApiClient.getVirtualFolders().done(function (result) {
|
||||
MediaLibraryPage.reloadVirtualFolders(page, result);
|
||||
});
|
||||
|
||||
$('#fldUseDefaultLibrary', page).hide();
|
||||
$('#divMediaLibrary', page).show();
|
||||
Dashboard.setPageTitle("Media Library");
|
||||
}
|
||||
$('#fldUseDefaultLibrary', page).hide();
|
||||
$('#divMediaLibrary', page).show();
|
||||
Dashboard.setPageTitle("Media Library");
|
||||
},
|
||||
|
||||
shouldRefreshLibraryAfterChanges: function () {
|
||||
|
|
@ -152,14 +88,14 @@
|
|||
|
||||
var location = virtualFolder.Locations[i];
|
||||
html += '<li>';
|
||||
html += '<a class="lnkMediaLocation" href="#">' + location + '</a>';
|
||||
html += '<a style="font-size:14px;" class="lnkMediaLocation" href="#">' + location + '</a>';
|
||||
html += '<a href="#" data-index="' + i + '" data-folderindex="' + index + '" onclick="MediaLibraryPage.deleteMediaLocation(this);"></a>';
|
||||
html += '</li>';
|
||||
}
|
||||
html += '</ul>';
|
||||
|
||||
if (addPathMappingInfo) {
|
||||
html += '<p>Use <a href="librarypathmapping.html" style="font-weight:normal;">path substitution</a> to map server paths to network shares that clients are able to access.</p>';
|
||||
html += '<p style="margin:1.5em 0;">Optional: <a href="librarypathmapping.html">Path substitution</a> can map server paths to network shares that clients can access for direct playback.</p>';
|
||||
}
|
||||
|
||||
html += '<p>';
|
||||
|
|
@ -173,38 +109,17 @@
|
|||
return html;
|
||||
},
|
||||
|
||||
setUseDefaultMediaLibrary: function (useDefaultLibrary) {
|
||||
|
||||
Dashboard.showLoadingMsg();
|
||||
|
||||
var page = $.mobile.activePage;
|
||||
var userId = MediaLibraryPage.getCurrentUserId(page);
|
||||
|
||||
ApiClient.getUser(userId).done(function (user) {
|
||||
|
||||
user.Configuration.UseCustomLibrary = !useDefaultLibrary;
|
||||
|
||||
ApiClient.updateUser(user).done(function () {
|
||||
MediaLibraryPage.reloadLibrary(page);
|
||||
});
|
||||
|
||||
$(".editing_default", page).hide();
|
||||
});
|
||||
},
|
||||
|
||||
addVirtualFolder: function () {
|
||||
|
||||
$('.collectionTypeFieldDescription').show();
|
||||
|
||||
MediaLibraryPage.getTextValue("Add Media Folder", "Name (Movies, Music, TV, etc):", "", true, function (name, type) {
|
||||
|
||||
var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
|
||||
|
||||
MediaLibraryPage.lastVirtualFolderName = name;
|
||||
|
||||
var refreshAfterChange = MediaLibraryPage.shouldRefreshLibraryAfterChanges();
|
||||
|
||||
ApiClient.addVirtualFolder(name, type, userId, refreshAfterChange).done(MediaLibraryPage.processOperationResult);
|
||||
ApiClient.addVirtualFolder(name, type, refreshAfterChange).done(MediaLibraryPage.processOperationResult);
|
||||
|
||||
});
|
||||
},
|
||||
|
|
@ -219,11 +134,9 @@
|
|||
|
||||
MediaLibraryPage.lastVirtualFolderName = virtualFolder.Name;
|
||||
|
||||
var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
|
||||
|
||||
var refreshAfterChange = MediaLibraryPage.shouldRefreshLibraryAfterChanges();
|
||||
|
||||
ApiClient.addMediaPath(virtualFolder.Name, path, userId, refreshAfterChange).done(MediaLibraryPage.processOperationResult);
|
||||
ApiClient.addMediaPath(virtualFolder.Name, path, refreshAfterChange).done(MediaLibraryPage.processOperationResult);
|
||||
}
|
||||
|
||||
});
|
||||
|
|
@ -336,11 +249,9 @@
|
|||
|
||||
if (virtualFolder.Name != newName) {
|
||||
|
||||
var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
|
||||
|
||||
var refreshAfterChange = MediaLibraryPage.shouldRefreshLibraryAfterChanges();
|
||||
|
||||
ApiClient.renameVirtualFolder(virtualFolder.Name, newName, userId, refreshAfterChange).done(MediaLibraryPage.processOperationResult);
|
||||
ApiClient.renameVirtualFolder(virtualFolder.Name, newName, refreshAfterChange).done(MediaLibraryPage.processOperationResult);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
|
@ -369,11 +280,9 @@
|
|||
|
||||
if (confirmResult) {
|
||||
|
||||
var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
|
||||
|
||||
var refreshAfterChange = MediaLibraryPage.shouldRefreshLibraryAfterChanges();
|
||||
|
||||
ApiClient.removeVirtualFolder(virtualFolder.Name, userId, refreshAfterChange).done(MediaLibraryPage.processOperationResult);
|
||||
ApiClient.removeVirtualFolder(virtualFolder.Name, refreshAfterChange).done(MediaLibraryPage.processOperationResult);
|
||||
}
|
||||
|
||||
});
|
||||
|
|
@ -394,11 +303,9 @@
|
|||
|
||||
if (confirmResult) {
|
||||
|
||||
var userId = MediaLibraryPage.getCurrentUserId($.mobile.activePage);
|
||||
|
||||
var refreshAfterChange = MediaLibraryPage.shouldRefreshLibraryAfterChanges();
|
||||
|
||||
ApiClient.removeMediaPath(virtualFolder.Name, location, userId, refreshAfterChange).done(MediaLibraryPage.processOperationResult);
|
||||
ApiClient.removeMediaPath(virtualFolder.Name, location, refreshAfterChange).done(MediaLibraryPage.processOperationResult);
|
||||
}
|
||||
});
|
||||
},
|
||||
|
|
@ -419,4 +326,4 @@
|
|||
}
|
||||
};
|
||||
|
||||
$(document).on('pageshow', ".mediaLibraryPage", MediaLibraryPage.onPageShow).on('pagehide', ".mediaLibraryPage", MediaLibraryPage.onPageHide);
|
||||
$(document).on('pageshow', ".mediaLibraryPage", MediaLibraryPage.onPageShow);
|
||||
|
|
@ -38,10 +38,37 @@
|
|||
$('#selectMaxParentalRating', page).html(html).selectmenu("refresh");
|
||||
}
|
||||
|
||||
function loadUser(page, user, loggedInUser, allParentalRatings) {
|
||||
function loadMediaFolders(page, user, mediaFolders) {
|
||||
|
||||
var html = '';
|
||||
|
||||
html += '<fieldset data-role="controlgroup">';
|
||||
|
||||
html += '<legend>Media Folders</legend>';
|
||||
|
||||
for (var i = 0, length = mediaFolders.length; i < length; i++) {
|
||||
|
||||
var folder = mediaFolders[i];
|
||||
|
||||
var id = 'mediaFolder' + i;
|
||||
|
||||
var checkedAttribute = user.Configuration.BlockedMediaFolders.indexOf(folder.Name) == -1 ? ' checked="checked"' : '';
|
||||
|
||||
html += '<input class="chkMediaFolder" data-foldername="' + folder.Name + '" type="checkbox" data-mini="true" id="' + id + '"' + checkedAttribute + ' />';
|
||||
html += '<label for="' + id + '">' + folder.Name + '</label>';
|
||||
}
|
||||
|
||||
html += '</fieldset>';
|
||||
|
||||
$('.libraryAccess', page).html(html).trigger('create');
|
||||
}
|
||||
|
||||
function loadUser(page, user, loggedInUser, allParentalRatings, mediaFolders) {
|
||||
|
||||
Dashboard.setPageTitle(user.Name);
|
||||
|
||||
loadMediaFolders(page, user, mediaFolders);
|
||||
|
||||
populateRatings(allParentalRatings, page);
|
||||
|
||||
var ratingValue = "";
|
||||
|
|
@ -61,7 +88,7 @@
|
|||
$('#selectMaxParentalRating', page).val(ratingValue).selectmenu("refresh");
|
||||
|
||||
$('#chkBlockNotRated', page).checked(user.Configuration.BlockNotRated || false).checkboxradio("refresh");
|
||||
|
||||
|
||||
$('#chkHideUnratedMovies', page).checked(user.Configuration.BlockUnratedMovies || false).checkboxradio("refresh");
|
||||
$('#chkHideUnratedTrailers', page).checked(user.Configuration.BlockUnratedTrailers || false).checkboxradio("refresh");
|
||||
$('#chkHideUnratedSeries', page).checked(user.Configuration.BlockUnratedSeries || false).checkboxradio("refresh");
|
||||
|
|
@ -94,6 +121,12 @@
|
|||
user.Configuration.BlockUnratedGames = $('#chkHideUnratedGames', page).checked();
|
||||
user.Configuration.BlockUnratedBooks = $('#chkHideUnratedBooks', page).checked();
|
||||
|
||||
user.Configuration.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () {
|
||||
|
||||
return this.getAttribute('data-foldername');
|
||||
|
||||
}).get();
|
||||
|
||||
ApiClient.updateUser(user).done(function () {
|
||||
onSaveComplete(page);
|
||||
});
|
||||
|
|
@ -146,9 +179,11 @@
|
|||
|
||||
var promise3 = ApiClient.getParentalRatings();
|
||||
|
||||
$.when(promise1, promise2, promise3).done(function (response1, response2, response3) {
|
||||
var promise4 = $.getJSON(ApiClient.getUrl("Library/MediaFolders"));
|
||||
|
||||
loadUser(page, response1[0] || response1, response2[0], response3[0]);
|
||||
$.when(promise1, promise2, promise3, promise4).done(function (response1, response2, response3, response4) {
|
||||
|
||||
loadUser(page, response1[0] || response1, response2[0], response3[0], response4[0].Items);
|
||||
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue