Skip to content

feat(search): Add media format filter to advanced search. #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sreeshanth-soma wants to merge 1 commit into
base: 5.5-develop
Choose a base branch
from
Open

feat(search): Add media format filter to advanced search. #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion core/models/media_model.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,7 +954,7 @@ public function search_filters_validate($args = [])
OBFHelpers::require_args($args, ['filters']);
$filters = $args['filters'];

$allowed_filters = ['comments','artist','title','album','year','type','category','country','language','genre','duration','is_copyright_owner','status','dynamic_select'];
$allowed_filters = ['comments','artist','title','album','year','type','format','category','country','language','genre','duration','is_copyright_owner','status','dynamic_select'];
$allowed_operators = [
// deprecated
'like',
Expand Down Expand Up @@ -1037,6 +1037,7 @@ public function search_filters_where_array($args = [])
$column_array['comments'] = 'media.comments';
$column_array['is_copyright_owner'] = 'media.is_copyright_owner';
$column_array['dynamic_select'] = 'media.dynamic_select';
$column_array['format'] = 'media.format';

$metadata_fields = $this->models->mediametadata('get_all');
$metadata_defaults = [];
Expand Down
3 changes: 3 additions & 0 deletions public/html/sidebar/advanced_search.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
<option value="album" data-compare="text" data-value="text" data-t>Album</option>
<option value="year" data-compare="number" data-value="text" data-t>Year</option>
<option value="type" data-compare="select" data-value="media_type" data-t>Media Type</option>
<option value="format" data-compare="select" data-value="format" data-t>Format</option>
<option value="category" data-compare="select" data-value="category" data-t>Category</option>
<option value="country" data-compare="select" data-value="country" data-t>Country</option>
<option value="language" data-compare="select" data-value="language" data-t>Language</option>
Expand Down Expand Up @@ -92,6 +93,8 @@

<select id="advanced_search_genre_options" data-type="value" data-name="genre" class="hidden"></select>

<select id="advanced_search_format_options" data-type="value" data-name="format" class="hidden"></select>

<select id="advanced_search_bool_options" data-type="value" data-name="bool" class="hidden">
<option value="1" data-t>Yes</option>
<option value="0" data-t>No</option>
Expand Down
2 changes: 2 additions & 0 deletions public/js/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ OB.Settings.getSettings = function (callback) {
post.push(["metadata", "media_get_fields", {}]);
post.push(["metadata", "playlist_item_types", {}]);
post.push(["metadata", "recording_default_values", {}]);
post.push(["media", "formats_get", {}]);

OB.API.multiPost(
post,
Expand All @@ -44,6 +45,7 @@ OB.Settings.getSettings = function (callback) {
OB.Settings.media_required_fields = response[6].data;
OB.Settings.playlist_item_types = response[7].data;
OB.Settings.recording_metadata = response[8].data;
OB.Settings.formats = response[9].data;

if (callback) callback();
},
Expand Down
17 changes: 17 additions & 0 deletions public/js/sidebar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1293,6 +1293,23 @@ OB.Sidebar.advancedSearchWindowInit = function () {
);
});

if (OB.Settings.formats) {
var all_formats = [];
$.each(["audio_formats", "video_formats", "image_formats", "document_formats"], function (i, key) {
if (OB.Settings.formats[key]) {
$.each(OB.Settings.formats[key], function (j, fmt) {
if (all_formats.indexOf(fmt) === -1) all_formats.push(fmt);
});
}
});
all_formats.sort();
$.each(all_formats, function (index, fmt) {
$("#advanced_search_format_options").append(
'<option value="' + fmt + '">' + htmlspecialchars(fmt.toUpperCase()) + "</option>",
);
});
}

$.each(OB.Settings.media_metadata, function (index, metadata) {
// skip hidden metadata and media/playlist currently unsupported for advanced search
if (metadata.type == "hidden" || metadata.type == "media" || metadata.type == "playlist") return;
Expand Down
Loading