From 1809b95e2decad4693d39b60a25904f573292390 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Sun, 17 Jan 2016 16:15:28 -0800 Subject: [PATCH] Add setting to enable calculating total file sizes * Setting is disabled by default --- .../default/images/media_info/576.png | Bin 0 -> 3469 bytes .../default/images/media_info/8ch.png | Bin 0 -> 2109 bytes .../default/js/tables/media_info_table.js | 15 ++--- data/interfaces/default/library.html | 10 +++- data/interfaces/default/library_stats.html | 2 +- data/interfaces/default/settings.html | 12 +++- plexpy/config.py | 3 +- plexpy/libraries.py | 52 +++++++++++------- plexpy/webserve.py | 20 ++++--- 9 files changed, 71 insertions(+), 43 deletions(-) create mode 100644 data/interfaces/default/images/media_info/576.png create mode 100644 data/interfaces/default/images/media_info/8ch.png diff --git a/data/interfaces/default/images/media_info/576.png b/data/interfaces/default/images/media_info/576.png new file mode 100644 index 0000000000000000000000000000000000000000..9871f3f980840b81c4577060a86260f013dc941e GIT binary patch literal 3469 zcmeAS@N?(olHy`uVBq!ia0y~yV9;V?$Fm_ZS!$jxjJW{DW}8>OB}37~&Zi7(g!G$iTp`jDdmS6I7ls_5c5WhX4Qn zbN&DSfA#%|5fq~%{NE1HH2=WmF1A`s|1H(?J z#(V|_hF4Gr!Sw!NU|_fbwL}d~4x|R;s7M9|h5`l#hG)!CEv*mn#J3=S(pV`K1_p*`1_lOD@>qzZUIJfrc7L9Snm)C>WYSK+y}*2a^Li5>(!T9NEsmzyK;o zLAe{`7*L51N-DVw3=Er~8bC1#%E%xOLWRJY8dT;U10`6s|NsBrg{1lad!ZRi>Hq)# zPXGV^-wG86m7PXd61~s=|Np=L|NsB#|Ns9@(By-la-a+b!k}_G?EnA&Y5)KKKMyq* zl%YTw5#$b#`5<$S|NsAgBh+qC`F;KW|NmYf1)xH=`Tzg_pqvRR)Ink}tnvT<|I5%q zx&qB1pqxDsYT;Ter9}wTp&%t7i$OUZW-h4W0961#|NsA=05uon(A&^}0#!gf|Ns9t z`~Uwx$g#&k(Ey6BS_TG&Oa=yqE3hz!(x9{isyadHw9%?gP_%=}Nl-f4jis~ziGz#* zrEO3q17#o(AB0ap(NcmOQ}L2PskDt?f~K(!et!+>%-s1brJ2V#TDN{}N#4gg`07%~RQf%q^-f!Lsc z0A(mp1_iM}84i@$Ye5bLRcD}94al-YXtf5?1jDjW1}Nl^4cCQ=gQ`Dlt)LfBvp^vN zN+wX{a7r4=0_jB#1W@@4au>)0pg>p-YPo>~K%odKoDw$YUUjKt+)!0|UbWBz2%72vlom9s2f1V6R13Qf$~B6;TXmMwQNA;8OV_!LqKMO3<8y58UO$P2g$?Kf@o0r1}gJF z1vjX|0EywkGXMYo2Q`vGo&tFsgh2&6s4)#{RKxUv%J9Sg|Npna=1^FB6dbw?3=BpL z3=E(Q1`^_du&%hzxcTRE>r(FffEd)A?d()d|uM l(*a8Npo|A<1c8b+m^hgJp3Lu4D&P)Q@9FC2vd$@?2>|0tBccER literal 0 HcmV?d00001 diff --git a/data/interfaces/default/images/media_info/8ch.png b/data/interfaces/default/images/media_info/8ch.png new file mode 100644 index 0000000000000000000000000000000000000000..30537cdef56a51afd4bd74fbec61407faf1de291 GIT binary patch literal 2109 zcmeAS@N?(olHy`uVBq!ia0y~yV31^BU=ZP8V_;yYD4({Mfq{Xuz$3Dlfr0M`2s2LA z=96Y%V1MuF;uvBf$oPa^`Uhi2M~4>!0|Oree(;Ndf#C=P1H&u)$`Ga#aIi2iF#LgHbd4Yj zco-NMKp_M22?(RB!Nr$gU|^_cU|>*SU|@IxvLqQ~8y3|f3=9n23=9k!3=9mb7#J8X zVNrukNQ!}hp`C$&0Tc}o`Tzg_GvL5^|NsC02@1~t|NkrDP=lHq)#X8-^H-~Jy0 z{z9n#kC7E2v(^6p|9>57Ng5Frfb@#}|Ns9W)Zn}S|No!;|NsB*|NsAg$^`Kb3JDU6 zh6d9y1_p+8D6+UYptu92Qc&VZWME)e%fP?@idP1Z3(&C&)EB@1|Noyvq%S~b2>k#5 zKj{De|1wZLUjP69{|fR6DB{uG=E1f}FuY@6VAzT*K?xh(5*tv#1P!Wdlo*Vx7uga}DQFFqJjB4j z019I$mof_35>QUnVqjqS!N9<9lrm#cbt78>DkQ}i7#JQgFfiOfRYn;P-4alN2(pCe zBApoPVfh4PnIcrfJq8AbFHkl%3gp`q1_lOh1_p-33=9l6uqi?ogINM95@etf51}+J z3RF7hGB7X*F)%P3CtwN4@eD9aKpYMR28M4$)PA7y2&4|=Fi>5D%P}B1P>B41SppK+ z$-uw>3MxYN1}LL0VPIeYCHV)qY=9=91q=)fpL1QT{12xxodK!!boFyt=akR{01_@v AMgRZ+ literal 0 HcmV?d00001 diff --git a/data/interfaces/default/js/tables/media_info_table.js b/data/interfaces/default/js/tables/media_info_table.js index 1a746e11..860f06ab 100644 --- a/data/interfaces/default/js/tables/media_info_table.js +++ b/data/interfaces/default/js/tables/media_info_table.js @@ -10,7 +10,6 @@ $.ajax({ } }); -var get_file_sizes = false; var refresh_child_tables = false; media_info_table_options = { @@ -24,7 +23,7 @@ media_info_table_options = { "emptyTable": "No data in table" }, "pagingType": "bootstrap", - "stateSave": true, + "stateSave": false, "processing": false, "serverSide": true, "pageLength": 25, @@ -102,7 +101,7 @@ media_info_table_options = { } } }, - "width": "24%" + "width": "20%" }, { "targets": [2], @@ -112,7 +111,7 @@ media_info_table_options = { $(td).html(cellData); } }, - "width": "5%", + "width": "6%", "className": "no-wrap hidden-sm hidden-xs" }, { @@ -123,7 +122,7 @@ media_info_table_options = { $(td).html(cellData + ' kbps'); } }, - "width": "5%", + "width": "6%", "className": "no-wrap hidden-md hidden-sm hidden-xs", "searchable": false }, @@ -189,7 +188,9 @@ media_info_table_options = { if (cellData !== null && cellData !== '') { $(td).html(Math.round(cellData / Math.pow(1024, 2)).toString() + ' MiB'); } else { - if (rowData['section_type'] != 'photo') { get_file_sizes = true; } + if (rowData['section_type'] != 'photo' && get_file_sizes != null) { + get_file_sizes = true; + } } }, "width": "7%", @@ -375,6 +376,7 @@ function childTableOptionsMedia(rowData) { createChildTableMedia(this, childrowData) } }); + } if (get_file_sizes) { $('#refresh-media-info-table').prop('disabled', true); @@ -395,7 +397,6 @@ function childTableOptionsMedia(rowData) { }); get_file_sizes = false; } - } $(this).closest('div.slider').slideDown(); } diff --git a/data/interfaces/default/library.html b/data/interfaces/default/library.html index 85e253bd..4f75e7fd 100644 --- a/data/interfaces/default/library.html +++ b/data/interfaces/default/library.html @@ -196,7 +196,7 @@ DOCUMENTATION :: END
- % if data['section_id'] in config['get_file_sizes']['section_ids']: + % if config['get_file_sizes'] and data['section_id'] in config['get_file_sizes_hold']['section_ids']:
% else:
- % if data['section_id'] in config['get_file_sizes']['section_ids']: + % if config['get_file_sizes'] and data['section_id'] in config['get_file_sizes_hold']['section_ids']: @@ -316,6 +316,12 @@ DOCUMENTATION :: END % endif var section_name = '${data['section_name'].replace("'", "\\'")}'; var refresh_table = false; + + % if config['get_file_sizes']: + var get_file_sizes = false; + % else: + var get_file_sizes = null; + % endif diff --git a/data/interfaces/default/library_stats.html b/data/interfaces/default/library_stats.html index 5c8a909a..048d5e6f 100644 --- a/data/interfaces/default/library_stats.html +++ b/data/interfaces/default/library_stats.html @@ -89,5 +89,5 @@ DOCUMENTATION :: END % endfor % else: -
No stats to show for the selected period.

+
No stats to show.

% endif \ No newline at end of file diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 94bac875..e7f0f4bd 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -453,6 +453,13 @@ available_notification_agents = sorted(notifiers.available_notification_agents()

If you have media indexing enabled on your server, use these on the activity pane.

+
+ +

Enable if you want PlexPy to calculate the total file size for TV Shows/Seasons and Artists/Albums on the media info tables.
+ This is currently experimental.

+

PlexWatch Import Tool

@@ -478,9 +485,10 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
-

Instead of polling the server at regular intervals let the server tell us when something happens. This is currently experimental. Encrypted websocket is not currently supported.

+

Instead of polling the server at regular intervals let the server tell us when something happens.
+ This is currently experimental. Encrypted websocket is not currently supported.