Skip to content

Commit 13804ab

Browse files
DeltaMikeCharlieFlole998
authored andcommitted
Show recording file name
1 parent cebe615 commit 13804ab

2 files changed

Lines changed: 12 additions & 4 deletions

File tree

src/webui/static/app/dvr.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ tvheadend.dvrDetails = function(grid, index) {
7777
var age_rating = params[25].value;
7878
var rating_label = params[26].value;
7979
var rating_icon = params[27].value;
80+
let filename = params[28].value;
8081
var content = '<div class="dvr-details-dialog">' +
8182
'<div class="dvr-details-dialog-background-image"></div>' +
8283
'<div class="dvr-details-dialog-content">';
@@ -153,6 +154,8 @@ tvheadend.dvrDetails = function(grid, index) {
153154
content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('Status') + ':</span><span class="x-epg-desc">' + status + '</span></div>';
154155
if (filesize)
155156
content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('File size') + ':</span><span class="x-epg-desc">' + parseInt(filesize / 1000000) + ' MB</span></div>';
157+
if (filename && (tvheadend.uiviewlevel ? tvheadend.uiviewlevel : tvheadend.uilevel) !== 'basic') // Only show for 'advanced' and 'expert' levels.
158+
content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('File name') + ':</span><span class="x-epg-desc">' + filename + '</span></div>';
156159
if (comment)
157160
content += '<div class="x-epg-meta"><span class="x-epg-prefix">' + _('Comment') + ':</span><span class="x-epg-desc">' + comment + '</span></div>';
158161
if (autorec_caption)
@@ -317,7 +320,7 @@ tvheadend.dvrDetails = function(grid, index) {
317320
list: 'channel_icon,disp_title,disp_subtitle,disp_summary,episode_disp,start_real,stop_real,' +
318321
'duration,disp_description,status,filesize,comment,duplicate,' +
319322
'autorec_caption,timerec_caption,image,copyright_year,credits,keyword,category,' +
320-
'first_aired,genre,channelname,fanart_image,broadcast,age_rating,rating_label,rating_icon',
323+
'first_aired,genre,channelname,fanart_image,broadcast,age_rating,rating_label,rating_icon,filename',
321324
},
322325
success: function(d) {
323326
d = json_decode(d);
@@ -624,7 +627,7 @@ tvheadend.dvr_upcoming = function(panel, index) {
624627
del: true,
625628
list: 'category,enabled,duplicate,disp_title,disp_extratext,episode_disp,' +
626629
'channel,image,copyright_year,start_real,stop_real,duration,pri,filesize,' +
627-
'sched_status,errors,data_errors,config_name,owner,creator,comment,genre,broadcast,age_rating,rating_label',
630+
'sched_status,errors,data_errors,config_name,owner,creator,comment,genre,broadcast,age_rating,rating_label,filename',
628631
columns: {
629632
disp_title: {
630633
renderer: tvheadend.displayWithYearAndDuplicateRenderer(),
@@ -814,7 +817,7 @@ tvheadend.dvr_finished = function(panel, index) {
814817
del: false,
815818
list: 'disp_title,disp_extratext,episode_disp,channel,channelname,' +
816819
'start_real,stop_real,duration,filesize,copyright_year,' +
817-
'sched_status,errors,data_errors,playcount,url,config_name,owner,creator,comment,age_rating,rating_label',
820+
'sched_status,errors,data_errors,playcount,url,config_name,owner,creator,comment,age_rating,rating_label,filename',
818821
columns: {
819822
disp_title: {
820823
renderer: tvheadend.displayWithYearRenderer(),
@@ -934,7 +937,7 @@ tvheadend.dvr_failed = function(panel, index) {
934937
_('The associated file will be removed from storage.'),
935938
list: 'disp_title,disp_extratext,episode_disp,channel,channelname,' +
936939
'image,copyright_year,start_real,stop_real,duration,filesize,status,' +
937-
'sched_status,errors,data_errors,playcount,url,config_name,owner,creator,comment,age_rating,rating_label',
940+
'sched_status,errors,data_errors,playcount,url,config_name,owner,creator,comment,age_rating,rating_label,filename',
938941
columns: {
939942
disp_title: {
940943
renderer: tvheadend.displayWithYearRenderer(),

src/webui/static/app/idnode.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1221,6 +1221,7 @@ tvheadend.idnode_editor = function(_uilevel, item, conf)
12211221
!conf.noUIlevel) {
12221222
uilevelBtn = tvheadend.idnode_uilevel_menu(uilevel, function(l) {
12231223
uilevel = l;
1224+
tvheadend.uiviewlevel = l;
12241225
var values = panel.getForm().getFieldValues();
12251226
destroy();
12261227
build();
@@ -1572,6 +1573,7 @@ tvheadend.idnode_create = function(conf, onlyDefault, cloneValues)
15721573
abuttons.uilevel = tvheadend.idnode_uilevel_menu(uilevel, function (l) {
15731574
values = panel.getForm().getFieldValues();
15741575
uilevel = l;
1576+
tvheadend.uiviewlevel = l;
15751577
createwin();
15761578
});
15771579
buttons.push('->');
@@ -2089,6 +2091,7 @@ tvheadend.idnode_grid = function(panel, conf)
20892091
if (!tvheadend.uilevel_nochange && (!conf.uilevel || conf.uilevel !== 'expert')) {
20902092
abuttons.uilevel = tvheadend.idnode_uilevel_menu(uilevel, function (l) {
20912093
uilevel = l;
2094+
tvheadend.uiviewlevel = l;
20922095
for (var i = 0; i < ifields.length; i++)
20932096
if (!ifields[i].noui) {
20942097
var h = ifields[i].get_hidden(uilevel);
@@ -2491,6 +2494,7 @@ tvheadend.idnode_form_grid = function(panel, conf)
24912494
if (!tvheadend.uilevel_nochange && (!conf.uilevel || conf.uilevel !== 'expert')) {
24922495
abuttons.uilevel = tvheadend.idnode_uilevel_menu(uilevel, function (l) {
24932496
uilevel = l;
2497+
tvheadend.uiviewlevel = l;
24942498
var values = null;
24952499
if (current)
24962500
values = current.editor.getForm().getFieldValues();
@@ -2925,6 +2929,7 @@ tvheadend.idnode_simple = function(panel, conf)
29252929
if (l === uilevel)
29262930
return;
29272931
uilevel = l;
2932+
tvheadend.uiviewlevel = l;
29282933
if (!refresh)
29292934
return;
29302935
var values = null;

0 commit comments

Comments
 (0)