starred/newznab-tmux
1
0
Fork 0
mirror of https://github.com/NNTmux/newznab-tmux.git synced 2026-09-01 02:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix video sample playback problem

Browse Source 
(cherry picked from commit 8a565bf)
This commit is contained in:
Darko
2015-04-08 11:27:22 +02:00
parent 5a67e7ab6a
commit f514528253
6 changed files with 31 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/ProcessAdditional.php
+4 -4
View File
@@ -405,7 +405,7 @@ Class ProcessAdditional
$this->_audioFileRegex = '\.(AAC|AIFF|APE|AC3|ASF|DTS|FLAC|MKA|MKS|MP2|MP3|RA|OGG|OGM|W64|WAV|WMA)';
$this->_ignoreBookRegex = '/\b(epub|lit|mobi|pdf|sipdf|html)\b.*\.rar(?!.{20,})/i';
$this->_supportFileRegex = '/\.(vol\d{1,3}\+\d{1,3}|par2|srs|sfv|nzb';
$this->_videoFileRegex = '\.(AVI|F4V|IFO|M1V|M2V|M4V|MKV|MOV|MP4|MPEG|MPG|MPGV|MPV|OGV|QT|RM|RMVB|TS|VOB|WMV)';
$this->_videoFileRegex = '\.(AVI|F4V|IFO|M1V|M2V|M4V|MKV|MOV|MP4|MPEG|MPG|MPGV|MPV|OGV|OGG|QT|RM|RMVB|TS|VOB|WMV)';
}
/**
@@ -1500,7 +1500,7 @@ Class ProcessAdditional
$iSQL = ', haspreview = 1';
}
if (is_file($this->_releaseImage->vidSavePath . $this->_release['guid'] . '.ogv')) {
if (is_file($this->_releaseImage->vidSavePath . $this->_release['guid'] . '.ogg')) {
$vSQL = ', videostatus = 1';
}
@@ -1939,7 +1939,7 @@ Class ProcessAdditional
if (is_file($fileLocation)) {
// Create a filename to store the temp file.
$fileName = ($this->tmpPath . 'zzzz' . $this->_release['guid'] . '.ogv');
$fileName = ($this->tmpPath . 'zzzz' . $this->_release['guid'] . '.ogg');
$newMethod = false;
// If wanted sample length is less than 60, try to get sample from the end of the video.
@@ -2010,7 +2010,7 @@ Class ProcessAdditional
if (is_file($fileName)) {
// Create a path to where the file should be moved.
$newFile = ($this->_releaseImage->vidSavePath . $this->_release['guid'] . '.ogv');
$newFile = ($this->_releaseImage->vidSavePath . $this->_release['guid'] . '.ogg');
// Try to move the file to the new path.
$renamed = @rename($fileName, $newFile);
lib/copy_this/www/lib/releaseimage.php
+1 -1
View File
@@ -177,6 +177,6 @@ class ReleaseImage
@unlink($this->jpgSavePath . $thumb);
// Video folder.
@unlink($this->vidSavePath . $guid . '.ogv');
@unlink($this->vidSavePath . $guid . '.ogg');
}
}
lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl
+1 -1
View File
@@ -1104,7 +1104,7 @@
<td>
{html_radios id="processvideos" name='processvideos' values=$yesno_ids output=$yesno_names selected=$fsite->processvideos separator='<br />'}
<div class="hint">Whether to attempt to process a video sample, these videos are very short 1-3 seconds,
100KB on average, in ogv format. You must have ffmpeg for this.<br/></div>
100KB on average, in ogg video format. You must have ffmpeg for this.<br/></div>
</td>
</tr>
lib/copy_this/www/templates/nntmux/views/frontend/browse.tpl
+17 -19
View File
@@ -90,16 +90,6 @@
<label for="chk{$result.guid|substr:0:7}"><a class="title" title="View details"
href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"seourl"}">{$result.searchname|escape:"htmlall"|replace:".":" "}</a></label>
{if $result.passwordstatus == 2}
<img title="Passworded Rar Archive"
src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock.gif"
alt="Passworded Rar Archive"/>
{elseif $result.passwordstatus == 1}
<img title="Contains .cab/ace/rar Archive"
src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock.gif"
alt="Contains .cab/ace/rar Archive"/>
{/if}
{if $userdata.canpre == 1 && $result.nuketype != ''}
&nbsp;
<img title="{$result.nuketype}"
@@ -110,9 +100,22 @@
<div class="resextra">
<div class="btns" style="float:right">
{release_flag($result.searchname, browse)}
{if $result.nfoid > 0}<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}"
title="View Nfo" class="modal_nfo rndbtn" rel="nfo">
Nfo</a>{/if}
{if $result.passwordstatus == 1}
<span class="icon-stack" title="Potentially Passworded"><i class="icon-check-empty icon-stack-base"></i><i class="icon-unlock-alt"></i></span>
{elseif $result.passwordstatus == 2}
<span class="icon-stack" title="Broken Post"><i class="icon-check-empty icon-stack-base"></i><i class="icon-unlink"></i></span>
{elseif $result.passwordstatus == 10}
<span class="icon-stack" title="Passworded Archive"><i class="icon-check-empty icon-stack-base"></i><i class="icon-lock"></i></span>
{/if}
{if $result.videostatus > 0}
<a
class="label label-default model_prev"
href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}"
title="This release has a video preview"
rel="preview"
><i class="icon-youtube-play"></i></a>
{/if}
{if $result.nfoid > 0}<a href="{$smarty.const.WWW_TOP}/nfo/{$result.guid}" title="View Nfo" class="modal_nfo rndbtn" rel="nfo"> Nfo</a>{/if}
{if $result.imdbid > 0}
<a href="#" name="name{$result.imdbid}" title="View movie info" class="modal_imdb rndbtn" rel="movie" >Cover</a>
{/if}
@@ -132,12 +135,7 @@
href="{$smarty.const.WWW_TOP}/covers/sample/{$result.guid}_thumb.jpg"
name="name{$result.guid}"title="Sample of {$result.searchname|escape:"htmlall"}"
class="modal_prev rndbtn" rel="preview">Sample</a>{/if}
{if $result.videostatus == 1}
<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}"
title="This release has a video preview." class="modal_prev rndbtn"
rel="preview">
<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/multimedia/video.png"/>
</a>{/if}
{if $result.haspreview == 2 && $userdata.canpreview == 1}<a href="#"
name="audio{$result.guid}"
title="Listen to {$result.searchname|escape:"htmlall"}"
lib/copy_this/www/templates/nntmux/views/frontend/search.tpl
+7 -3
View File
@@ -225,9 +225,13 @@
{elseif $result.passwordstatus == 10}
<img title="RAR/ZIP is Passworded." src="{$smarty.const.WWW_TOP}/templates/nntmux/images/icons/lock.gif" alt="RAR/ZIP is Passworded.">
{/if}
{if $result.videostatus == 1}
<a href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}" title="This release has a video preview." class="model_prev rndbtn" rel="preview">
<img src="{$smarty.const.WWW_TOP}/templates/nntmux/images/multimedia/video.png">
{if $result.videostatus > 0}
<a
class="model_prev label label-default"
href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}"
title="This release has a video preview."
rel="preview"
><i class="icon-youtube-play"></i>
</a>
{/if}
{if $result.nfoid > 0}
lib/copy_this/www/templates/nntmux/views/frontend/viewnzb.tpl
+1 -1
View File
@@ -528,7 +528,7 @@
{if $release.videostatus == 1 && $userdata.canpreview == 1}
<div class="tab-pane" id="video">
<video width="770" controls>
<source src="{$smarty.const.WWW_TOP}/covers/video/{$release.guid}.ogv" type="video/ogg">
<source src="{$smarty.const.WWW_TOP}/covers/video/{$release.guid}.ogg" type="video/ogg">
Your browser does not support the video tag.
</video>
</div>