diff --git a/CHANGELOG b/CHANGELOG new file mode 100644 index 000000000..1e9c4c44a --- /dev/null +++ b/CHANGELOG @@ -0,0 +1,2 @@ +2015-09-24 DariusIII +- Add failed downloads count to releases. \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 000000000..db8fc15b7 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,8 @@ +If you want to contribute to newznab-tmux project, you should follow couple of simple rules: + + 1. Your pull requests (PR) should be named as follows: branch-username-shortdescription (i.e. dev-dariusiii-fixedshit). + + 2. For dev regexless branch PR need to be done for dev-regexless branch, for dev into dev branch. + + 3. Pull requests will not be accepted for master branch. They will be rejected. + \ No newline at end of file diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..89beb6b47 --- /dev/null +++ b/LICENSE @@ -0,0 +1 @@ +This project is licensed under GPLv2 license. Parts of the code have their own licenses and are in their respective folders. \ No newline at end of file diff --git a/misc/testing/getConsole.php b/misc/testing/getConsole.php index ec8504313..f7b4fa956 100644 --- a/misc/testing/getConsole.php +++ b/misc/testing/getConsole.php @@ -5,7 +5,7 @@ require_once dirname(__FILE__) . '/../../www/config.php'; use newznab\db\Settings; -$console = new Console(true); +$console = new Console(['Echo' => true, 'Settings' => $pdo]); $db = new Settings(); diff --git a/newznab/controllers/Books.php b/newznab/controllers/Books.php index e9423e8aa..90f1fe06d 100644 --- a/newznab/controllers/Books.php +++ b/newznab/controllers/Books.php @@ -210,6 +210,7 @@ class Books . "GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, " . "GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, " . "GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, " + . "GROUP_CONCAT(r.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed," . "boo.*, r.bookinfoid, groups.name AS group_name, rn.id as nfoid FROM releases r " . "LEFT OUTER JOIN groups ON groups.id = r.groupid " . "LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id " diff --git a/newznab/controllers/Games.php b/newznab/controllers/Games.php index fdda96dd5..d57422eaa 100644 --- a/newznab/controllers/Games.php +++ b/newznab/controllers/Games.php @@ -228,6 +228,7 @@ class Games . "GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, " . "GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, " . "GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, " + . "GROUP_CONCAT(r.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed," . "con.*, YEAR (con.releasedate) as year, r.gamesinfo_id, groups.name AS group_name, rn.id as nfoid FROM releases r " . "LEFT OUTER JOIN groups ON groups.id = r.groupid " diff --git a/newznab/controllers/Konsole.php b/newznab/controllers/Konsole.php index cc577eac5..acb600953 100644 --- a/newznab/controllers/Konsole.php +++ b/newznab/controllers/Konsole.php @@ -206,6 +206,7 @@ class Konsole . "GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, " . "GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, " . "GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, " + . "GROUP_CONCAT(r.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed," . "con.*, r.consoleinfoid, groups.name AS group_name, rn.id as nfoid FROM releases r " . "LEFT OUTER JOIN groups ON groups.id = r.groupid " . "LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id " diff --git a/newznab/controllers/Movie.php b/newznab/controllers/Movie.php index 1e02a1e3b..473ce2e8b 100644 --- a/newznab/controllers/Movie.php +++ b/newznab/controllers/Movie.php @@ -314,6 +314,7 @@ class Movie GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, + GROUP_CONCAT(r.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed, m.*, groups.name AS group_name, rn.id as nfoid FROM releases r LEFT OUTER JOIN groups ON groups.id = r.groupid LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id diff --git a/newznab/controllers/Musik.php b/newznab/controllers/Musik.php index 49b7ccaeb..f8995b0ea 100644 --- a/newznab/controllers/Musik.php +++ b/newznab/controllers/Musik.php @@ -238,6 +238,7 @@ class Musik . "GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, " . "GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, " . "GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, " + . "GROUP_CONCAT(r.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed," . "m.*, r.musicinfoid, groups.name AS group_name, rn.id as nfoid FROM releases r " . "LEFT OUTER JOIN groups ON groups.id = r.groupid " . "LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id " diff --git a/newznab/controllers/Releases.php b/newznab/controllers/Releases.php index 591af4c5f..9b4d22220 100644 --- a/newznab/controllers/Releases.php +++ b/newznab/controllers/Releases.php @@ -1593,6 +1593,16 @@ class Releases } } + /** + * @param string $guid + */ + public function updateFail($guid) + { + $this->pdo->queryExec( + sprintf('UPDATE releases SET failed = failed + 1 WHERE guid = %s', $this->pdo->escapeString($guid)) + ); + } + /** * @return array */ @@ -1813,6 +1823,8 @@ class Releases ) ); + $this->updateFail($guid); + $alternate = $this->pdo->queryOneRow(sprintf('SELECT * FROM releases r WHERE r.searchname %s AND r.guid NOT IN (SELECT guid FROM dnzb_failures WHERE userid = %d)', diff --git a/newznab/controllers/XXX.php b/newznab/controllers/XXX.php index 5454edcc5..798b7a3bb 100644 --- a/newznab/controllers/XXX.php +++ b/newznab/controllers/XXX.php @@ -201,6 +201,7 @@ class XXX GROUP_CONCAT(r.totalpart ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_totalparts, GROUP_CONCAT(r.comments ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_comments, GROUP_CONCAT(r.grabs ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_grabs, + GROUP_CONCAT(r.failed ORDER BY r.postdate DESC SEPARATOR ',') AS grp_release_failed, xxx.*, UNCOMPRESS(xxx.plot) AS plot, groups.name AS group_name, rn.id as nfoid FROM releases r LEFT OUTER JOIN groups ON groups.id = r.groupid LEFT OUTER JOIN releasenfo rn ON rn.releaseid = r.id diff --git a/www/admin/console-edit.php b/www/admin/console-edit.php index 6cd4d68bb..f18447eac 100644 --- a/www/admin/console-edit.php +++ b/www/admin/console-edit.php @@ -3,7 +3,7 @@ require_once './config.php'; $page = new AdminPage(); -$console = new Console(); +$console = new Console(['Settings' => $page->settings]); $gen = new Genres(); $id = 0; @@ -53,4 +53,4 @@ if (isset($_REQUEST["id"])) } $page->content = $page->smarty->fetch('console-edit.tpl'); -$page->render(); +$page->render(); \ No newline at end of file diff --git a/www/admin/console-list.php b/www/admin/console-list.php index 63a570090..6cc5424fb 100644 --- a/www/admin/console-list.php +++ b/www/admin/console-list.php @@ -3,8 +3,7 @@ require_once './config.php'; $page = new AdminPage(); - -$con = new Console(); +$con = new Console(['Settings' => $page->settings]); $page->title = "Console List"; @@ -23,4 +22,4 @@ $consolelist = $con->getRange($offset, ITEMS_PER_PAGE); $page->smarty->assign('consolelist',$consolelist); $page->content = $page->smarty->fetch('console-list.tpl'); -$page->render(); +$page->render(); \ No newline at end of file diff --git a/www/pages/consolemodal.php b/www/pages/consolemodal.php index e48c76e34..c29aa6dc1 100644 --- a/www/pages/consolemodal.php +++ b/www/pages/consolemodal.php @@ -1,12 +1,11 @@ users->isLoggedIn()) $page->show403(); if (isset($_GET["id"]) && ctype_digit($_GET["id"])) { + $console = new Console(['Settings' => $page->settings]); $con = $console->getConsoleInfo($_GET['id']); if (!$con) $page->show404(); @@ -32,5 +31,4 @@ if (isset($_GET["id"]) && ctype_digit($_GET["id"])) echo $page->content; else $page->render(); -} - +} \ No newline at end of file diff --git a/www/pages/details.php b/www/pages/details.php index 48fed8bab..6ef633417 100644 --- a/www/pages/details.php +++ b/www/pages/details.php @@ -132,7 +132,7 @@ if (isset($_GET["id"])) $con = ''; if ($data['consoleinfoid'] != '') { - $c = new Console(); + $c = new Konsole(); $con = $c->getConsoleInfo($data['consoleinfoid']); } diff --git a/www/templates/charisma/views/frontend/books.tpl b/www/templates/charisma/views/frontend/books.tpl index f3576122d..d297522d4 100644 --- a/www/templates/charisma/views/frontend/books.tpl +++ b/www/templates/charisma/views/frontend/books.tpl @@ -79,6 +79,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -86,12 +87,12 @@
-
+
{$result.author|escape: + alt="{$result.author|escape:"htmlall"} - {$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if isset($resulturl) && $result.url != ""}Group + {if $mfailed[$m@index] > 0} + {$mfailed[$m@index]} + Failed Download{if $mfailed[$m@index] != 1}s{/if} + {/if}
-
+

{$result.author|escape:"htmlall"} - {$result.title|escape:"htmlall"}

diff --git a/www/templates/charisma/views/frontend/browse.tpl b/www/templates/charisma/views/frontend/browse.tpl index 0dd9357b5..ab8cd321a 100644 --- a/www/templates/charisma/views/frontend/browse.tpl +++ b/www/templates/charisma/views/frontend/browse.tpl @@ -98,7 +98,7 @@ value="{$result.guid}"/> {$result.searchname|escape:"htmlall"|replace:".":" "} + class="title">{$result.searchname|escape:"htmlall"|replace:".":" "}{if $result.failed > 0} {/if}
{$result.grabs} Grab{if $result.grabs != 1}s{/if} @@ -117,6 +117,8 @@ Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}{/if} {if $result.anidbid > 0}View Anime{/if} + {if $result.failed > 0} + {$result.grabs} Grabs / {$result.failed} Failed Downloads{/if} {$result.category_name} diff --git a/www/templates/charisma/views/frontend/console.tpl b/www/templates/charisma/views/frontend/console.tpl index d62e0a552..f84466244 100644 --- a/www/templates/charisma/views/frontend/console.tpl +++ b/www/templates/charisma/views/frontend/console.tpl @@ -96,6 +96,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -104,12 +105,12 @@
-
+
{$result.title|escape: + alt="{$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if $result.url != ""}Group + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}
-
+

{$result.title|escape:"htmlall"}

diff --git a/www/templates/charisma/views/frontend/games.tpl b/www/templates/charisma/views/frontend/games.tpl index 1d36de3c4..b6037b8e3 100644 --- a/www/templates/charisma/views/frontend/games.tpl +++ b/www/templates/charisma/views/frontend/games.tpl @@ -93,6 +93,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -101,12 +102,12 @@
-
+
{$result.title|escape: + alt="{$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if $result.classused == "gb"}Group + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}
-
+

{$result.title|escape:"htmlall"} ( {$msize[$m@index]|fsize_format:"MB"} Posted {$mpostdate[$m@index]|timeago} diff --git a/www/templates/charisma/views/frontend/movies.tpl b/www/templates/charisma/views/frontend/movies.tpl index 043bd0627..dde9c2fba 100644 --- a/www/templates/charisma/views/frontend/movies.tpl +++ b/www/templates/charisma/views/frontend/movies.tpl @@ -120,8 +120,8 @@
-
-
+
+
{foreach from=$result.languages item=movielanguage} {release_flag($movielanguage, browse)} {/foreach} @@ -135,6 +135,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -144,7 +145,7 @@ class="cover" src="{if $result.cover == 1}{$smarty.const.WWW_TOP}covers/movies/{$result.imdbid}-cover.jpg{else}{$smarty.const.WWW_TOP}templates_shared/images/no-cover.png{/if}" width="100" border="0" - alt="{$result.title|escape:"htmlall"}"/> + alt="{$result.title|escape:"htmlall"}"/> {if $mfailed[$m@index]} {/if} Group
-
+
{$result.title|escape:"htmlall"}
{if $result.genre != ''} @@ -219,6 +220,10 @@ title="Add to CouchPotato" > {/if} + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}
{/if} @@ -231,11 +236,11 @@ {else} -
+
-
-
+
+
{foreach from=$result.languages item=movielanguage} {release_flag($movielanguage, browse)} {/foreach} @@ -249,6 +254,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -258,7 +264,7 @@ class="cover" src="{if $result.cover == 1}{$smarty.const.WWW_TOP}covers/movies/{$result.imdbid}-cover.jpg{else}{$smarty.const.WWW_TOP}templates_shared/images/no-cover.png{/if}" width="100" border="0" - alt="{$result.title|escape:"htmlall"}"/> + alt="{$result.title|escape:"htmlall"}"/> {if $mfailed[$m@index] > 0} {/if} Group
-
+
{$result.title|escape:"htmlall"}
{if $result.genre != ''} @@ -326,13 +332,17 @@ {/if} {if $cpurl != '' && $cpapi != ''} {/if} + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}
{/if} diff --git a/www/templates/charisma/views/frontend/music.tpl b/www/templates/charisma/views/frontend/music.tpl index cdecd1ee6..e4b28b461 100644 --- a/www/templates/charisma/views/frontend/music.tpl +++ b/www/templates/charisma/views/frontend/music.tpl @@ -105,6 +105,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -113,12 +114,12 @@
-
+
{$result.artist|escape: + alt="{$result.artist|escape:"htmlall"} - {$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if $result.url != ""}Group + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}
-
+

{$result.artist|escape:"htmlall"} - {$result.title|escape:"htmlall"} ( {$result.searchname|escape:"htmlall"|truncate:150:"...":true} + href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">{$result.searchname|escape:"htmlall"|truncate:150:"...":true}{if $result.failed > 0} {/if}
{release_flag($result.searchname, browse)} @@ -266,6 +266,8 @@ href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name|escape:"htmlall"}" title="Browse {$result.group_name}">{$result.group_name|escape:"htmlall"|replace:"alt.binaries.":"a.b."} {/if} + {if $result.failed > 0} + {$result.grabs} Grab{if $result.grabs != 1}s{/if} / {$result.failed} Failed Download{if $result.failed != 1}s{/if}{/if}
diff --git a/www/templates/charisma/views/frontend/viewnzb.tpl b/www/templates/charisma/views/frontend/viewnzb.tpl index 049edc681..fd7a3d18d 100644 --- a/www/templates/charisma/views/frontend/viewnzb.tpl +++ b/www/templates/charisma/views/frontend/viewnzb.tpl @@ -12,7 +12,8 @@
-

{$release.searchname|escape:"htmlall"}

+

{$release.searchname|escape:"htmlall"} {if $release.failed > 0} + {$release.grabs} Grabs / {$release.failed} Failed Downloads{/if}

{if isset($isadmin)} Trailer {/if} - {if isset($nfo.nfo) && $nfo.nfo != ""} + {if isset($nfo.nfo) && $nfo.nfo != ''}
  • NFO
    • {/if} {if isset($similars) && $similars|@count > 1} @@ -139,8 +140,8 @@
    -
    -
    +
    +
    {if $movie && $release.rageid < 0 && $movie.cover == 1}

    -
    +
    @@ -449,6 +450,11 @@ + + + + diff --git a/www/templates/charisma/views/frontend/xxx.tpl b/www/templates/charisma/views/frontend/xxx.tpl index a89ac5030..7b1fb3dbb 100644 --- a/www/templates/charisma/views/frontend/xxx.tpl +++ b/www/templates/charisma/views/frontend/xxx.tpl @@ -102,8 +102,8 @@
    -
    -
    +
    +
    {assign var="msplits" value=","|explode:$result.grp_release_id} {assign var="mguid" value=","|explode:$result.grp_release_guid} {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} @@ -114,6 +114,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -123,7 +124,7 @@ class="cover" src="{if $result.cover == 1}{$smarty.const.WWW_TOP}covers/xxx/{$result.id}-cover.jpg{else}{$smarty.const.WWW_TOP}templates_shared/images/no-cover.png{/if}" width="100" border="0" - alt="{$result.title|escape:"htmlall"}"/> + alt="{$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if $result.classused == "ade"} Group + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}
    -
    +
    {$result.title|escape:"htmlall"}
    {if $result.genre != ''}{$result.genre}, {/if}
    @@ -241,11 +246,11 @@ {else} -
    +
    -
    -
    +
    +
    {assign var="msplits" value=","|explode:$result.grp_release_id} {assign var="mguid" value=","|explode:$result.grp_release_guid} {assign var="mnfo" value=","|explode:$result.grp_release_nfoid} @@ -256,6 +261,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -265,7 +271,7 @@ class="cover" src="{if $result.cover == 1}{$smarty.const.WWW_TOP}covers/xxx/{$result.id}-cover.jpg{else}{$smarty.const.WWW_TOP}templates_shared/images/no-cover.png{/if}" width="100" border="0" - alt="{$result.title|escape:"htmlall"}"/> + alt="{$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if $result.classused == "ade"} Group + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}
    -
    +
    {$result.title|escape:"htmlall"}
    {if $result.genre != ''}{$result.genre}, {/if}
    diff --git a/www/templates/omicron/views/frontend/books.tpl b/www/templates/omicron/views/frontend/books.tpl index 44b4988cf..d297522d4 100644 --- a/www/templates/omicron/views/frontend/books.tpl +++ b/www/templates/omicron/views/frontend/books.tpl @@ -79,6 +79,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -91,7 +92,7 @@ href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}"> {$result.author|escape: + alt="{$result.author|escape:"htmlall"} - {$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if isset($resulturl) && $result.url != ""}Group + {if $mfailed[$m@index] > 0} + {$mfailed[$m@index]} + Failed Download{if $mfailed[$m@index] != 1}s{/if} + {/if}

    diff --git a/www/templates/omicron/views/frontend/console.tpl b/www/templates/omicron/views/frontend/console.tpl index b2c1f9eb4..f84466244 100644 --- a/www/templates/omicron/views/frontend/console.tpl +++ b/www/templates/omicron/views/frontend/console.tpl @@ -96,6 +96,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -109,7 +110,7 @@ href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}"> {$result.title|escape: + alt="{$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if $result.url != ""}Group + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}

    {$result.title|escape: + alt="{$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if $result.classused == "gb"}Group + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}

    + alt="{$result.title|escape:"htmlall"}"/> {if $mfailed[$m@index]} {/if} {/if} + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}

    {/if} @@ -249,6 +254,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -258,7 +264,7 @@ class="cover" src="{if $result.cover == 1}{$smarty.const.WWW_TOP}covers/movies/{$result.imdbid}-cover.jpg{else}{$smarty.const.WWW_TOP}templates_shared/images/no-cover.png{/if}" width="100" border="0" - alt="{$result.title|escape:"htmlall"}"/> + alt="{$result.title|escape:"htmlall"}"/> {if $mfailed[$m@index] > 0} {/if} {/if} + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if} {/if} diff --git a/www/templates/omicron/views/frontend/music.tpl b/www/templates/omicron/views/frontend/music.tpl index ddc98f423..e4b28b461 100644 --- a/www/templates/omicron/views/frontend/music.tpl +++ b/www/templates/omicron/views/frontend/music.tpl @@ -105,6 +105,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -118,7 +119,7 @@ href="{$smarty.const.WWW_TOP}/details/{$mguid[$m@index]}/{$mname[$m@index]|escape:"htmlall"}"> {$result.artist|escape: + alt="{$result.artist|escape:"htmlall"} - {$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if $result.url != ""}Group + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}

    {$result.searchname|escape:"htmlall"|truncate:150:"...":true} + href="{$smarty.const.WWW_TOP}/details/{$result.guid}/{$result.searchname|escape:"htmlall"}">{$result.searchname|escape:"htmlall"|truncate:150:"...":true}{if $result.failed > 0} {/if}
    {release_flag($result.searchname, browse)} @@ -266,6 +266,8 @@ href="{$smarty.const.WWW_TOP}/browse?g={$result.group_name|escape:"htmlall"}" title="Browse {$result.group_name}">{$result.group_name|escape:"htmlall"|replace:"alt.binaries.":"a.b."} {/if} + {if $result.failed > 0} + {$result.grabs} Grab{if $result.grabs != 1}s{/if} / {$result.failed} Failed Download{if $result.failed != 1}s{/if}{/if}
    diff --git a/www/templates/omicron/views/frontend/viewnzb.tpl b/www/templates/omicron/views/frontend/viewnzb.tpl index 73fdbfbcf..fd7a3d18d 100644 --- a/www/templates/omicron/views/frontend/viewnzb.tpl +++ b/www/templates/omicron/views/frontend/viewnzb.tpl @@ -12,7 +12,8 @@
    -

    {$release.searchname|escape:"htmlall"}

    +

    {$release.searchname|escape:"htmlall"} {if $release.failed > 0} + {$release.grabs} Grabs / {$release.failed} Failed Downloads{/if}

    {if isset($isadmin)} 0} Add to My Shows - View all episodes {$release.grabs} time{if $release.grabs==1}{else}s{/if}

    + + + + diff --git a/www/templates/omicron/views/frontend/xxx.tpl b/www/templates/omicron/views/frontend/xxx.tpl index ff68c7ade..7b1fb3dbb 100644 --- a/www/templates/omicron/views/frontend/xxx.tpl +++ b/www/templates/omicron/views/frontend/xxx.tpl @@ -114,6 +114,7 @@ {assign var="mtotalparts" value=","|explode:$result.grp_release_totalparts} {assign var="mcomments" value=","|explode:$result.grp_release_comments} {assign var="mgrabs" value=","|explode:$result.grp_release_grabs} + {assign var="mfailed" value=","|explode:$result.grp_release_failed} {assign var="mpass" value=","|explode:$result.grp_release_password} {assign var="minnerfiles" value=","|explode:$result.grp_rarinnerfilecount} {assign var="mhaspreview" value=","|explode:$result.grp_haspreview} @@ -123,7 +124,7 @@ class="cover" src="{if $result.cover == 1}{$smarty.const.WWW_TOP}covers/xxx/{$result.id}-cover.jpg{else}{$smarty.const.WWW_TOP}templates_shared/images/no-cover.png{/if}" width="100" border="0" - alt="{$result.title|escape:"htmlall"}"/> + alt="{$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if $result.classused == "ade"} Group + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}
    + alt="{$result.title|escape:"htmlall"}"/>{if $mfailed[$m@index] > 0} {/if} {if $result.classused == "ade"} Group + {if $mfailed[$m@index] > 0} + + {$mgrabs[$m@index]} Grabs / {$mfailed[$m@index]} Failed Downloads + {/if}
    {$release.grabs} time{if $release.grabs==1}{else}s{/if}
    Failed Download{$release.failed} + time{if $release.failed==1}{else}s{/if}
    Password {$result.searchname|escape:"htmlall"|replace:".":" "} + class="title">{$result.searchname|escape:"htmlall"|replace:".":" "}{if $result.failed > 0} {/if}
    {$result.grabs} Grab{if $result.grabs != 1}s{/if} @@ -117,6 +117,8 @@ Aired {if $result.tvairdate|strtotime > $smarty.now}in future{else}{$result.tvairdate|daysago}{/if}{/if} {if $result.anidbid > 0}View Anime{/if} + {if $result.failed > 0} + {$result.grabs} Grabs / {$result.failed} Failed Downloads{/if}     		{$result.category_name}
    Failed Download{$release.failed} + time{if $release.failed==1}{else}s{/if}
    Password