diff --git a/lib/ProcessAdditional.php b/lib/ProcessAdditional.php index fa3845ec8..2c8d7c9d5 100644 --- a/lib/ProcessAdditional.php +++ b/lib/ProcessAdditional.php @@ -403,7 +403,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)'; } /** @@ -1498,7 +1498,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'; } @@ -1937,7 +1937,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. @@ -2008,7 +2008,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); diff --git a/lib/copy_this/www/lib/releaseimage.php b/lib/copy_this/www/lib/releaseimage.php index f1d623f70..ce53c852a 100644 --- a/lib/copy_this/www/lib/releaseimage.php +++ b/lib/copy_this/www/lib/releaseimage.php @@ -177,6 +177,6 @@ class ReleaseImage @unlink($this->jpgSavePath . $thumb); // Video folder. - @unlink($this->vidSavePath . $guid . '.ogv'); + @unlink($this->vidSavePath . $guid . '.ogg'); } } \ No newline at end of file diff --git a/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl b/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl index fd66143cc..711e5babe 100644 --- a/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl +++ b/lib/copy_this/www/templates/nntmux/views/admin/site-edit.tpl @@ -1130,7 +1130,7 @@ {html_radios id="processvideos" name='processvideos' values=$yesno_ids output=$yesno_names selected=$fsite->processvideos separator='
'}
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.
+ 100KB on average, in ogg video format. You must have ffmpeg for this.
diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/browse.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/browse.tpl index d45aacb6f..40843b543 100644 --- a/lib/copy_this/www/templates/nntmux/views/frontend/browse.tpl +++ b/lib/copy_this/www/templates/nntmux/views/frontend/browse.tpl @@ -90,16 +90,6 @@ - {if $result.passwordstatus == 2} - Passworded Rar Archive - {elseif $result.passwordstatus == 1} - Contains .cab/ace/rar Archive - {/if} - {if $userdata.canpre == 1 && $result.nuketype != ''}  
{release_flag($result.searchname, browse)} - {if $result.nfoid > 0} - Nfo{/if} + {if $result.passwordstatus == 1} + + {elseif $result.passwordstatus == 2} + + {elseif $result.passwordstatus == 10} + + {/if} + {if $result.videostatus > 0} + + {/if} + {if $result.nfoid > 0} Nfo{/if} {if $result.imdbid > 0} Cover {/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{/if} - {if $result.videostatus == 1} - - - {/if} + {if $result.haspreview == 2 && $userdata.canpreview == 1} {/if} - {if $result.videostatus == 1} - - + {if $result.videostatus > 0} + {/if} {if $result.nfoid > 0} diff --git a/lib/copy_this/www/templates/nntmux/views/frontend/viewnzb.tpl b/lib/copy_this/www/templates/nntmux/views/frontend/viewnzb.tpl index e523dd867..da28806aa 100644 --- a/lib/copy_this/www/templates/nntmux/views/frontend/viewnzb.tpl +++ b/lib/copy_this/www/templates/nntmux/views/frontend/viewnzb.tpl @@ -528,7 +528,7 @@ {if $release.videostatus == 1 && $userdata.canpreview == 1}