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

Fix couple of issues

Browse Source
This commit is contained in:
DariusIII
2021-03-07 23:08:36 +01:00
parent 60c46117dd
commit 255a761c17
5 changed files with 36 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Blacklight/Console.php
+6 -2
View File
@@ -706,10 +706,12 @@ class Console
try {
$result = Game::where('name', $gameInfo)->get();
if (! empty($result)) {
$bestMatchPct = 0;
foreach ($result as $res) {
similar_text(strtolower($gameInfo), strtolower($res->name), $percent);
if ($percent >= 90) {
if ($percent >= 90 && $percent > $bestMatchPct) {
$bestMatch = $res->id;
$bestMatchPct = $percent;
}
}
if ($bestMatch !== false) {
@@ -744,10 +746,12 @@ class Console
if (! empty($game->platforms)) {
foreach ($game->platforms as $platforms) {
$percentCurrent = 0;
$gamePlatforms = Platform::where('id', $platforms)->get();
foreach ($gamePlatforms as $gamePlat) {
similar_text($gamePlat->name, $gamePlatform, $percent);
if ($percent >= 85) {
if ($percent >= 85 && $percent > $percentCurrent) {
$percentCurrent = $percent;
$platform = $gamePlat->name;
break;
}
Blacklight/Games.php
+6 -6
View File
@@ -509,12 +509,12 @@ class Games
$result = $this->giantBomb->search($gameInfo['title'], 'Game');
if (! \is_object($result)) {
$percentCurrent = 0;
$bestMatchPct = 0;
foreach ($result as $res) {
similar_text(strtolower($gameInfo['title']), strtolower($res->name), $percent1);
if ($percent1 >= self::GAME_MATCH_PERCENTAGE && $percent1 > $percentCurrent) {
$percentCurrent = $percent1;
if ($percent1 >= self::GAME_MATCH_PERCENTAGE && $percent1 > $bestMatchPct) {
$bestMatch = $res->id;
$bestMatchPct = $percent1;
}
}
@@ -578,12 +578,12 @@ class Games
$this->_classUsed = 'IGDB';
$result = Game::where('name', $gameInfo['title'])->get();
if (! empty($result)) {
$percentCurrent = 0;
$bestMatchPct = 0;
foreach ($result as $res) {
similar_text(strtolower($gameInfo['title']), strtolower($res->name), $percent1);
if ($percent1 >= self::GAME_MATCH_PERCENTAGE && $percent1 > $percentCurrent) {
$percentCurrent = $percent1;
if ($percent1 >= self::GAME_MATCH_PERCENTAGE && $percent1 > $bestMatchPct) {
$bestMatch = $res->id;
$bestMatchPct = $percent1;
}
}
if ($bestMatch !== false) {
Blacklight/NameFixer.php
+9 -9
View File
@@ -707,13 +707,13 @@ class NameFixer
AND rf.mediainfo REGEXP '\<Movie_name\>'
AND rel.nzbstatus = %d
AND rel.isrenamed = %d
AND rel.predb_id = 0
AND rel.categories_id IN (%d, %d)",
AND rel.predb_id = 0",
NZB::NZB_ADDED,
self::IS_RENAMED_NONE,
Category::OTHER_MISC,
Category::OTHER_HASHED
self::IS_RENAMED_NONE
);
if ($cats == 2) {
$query .= PHP_EOL.sprintf('AND rel.categories_id IN (%s)', [Category::OTHER_MISC, Category::OTHER_HASHED]);
}
}
$releases = $this->_getReleases($time, $cats, $query);
@@ -757,10 +757,10 @@ class NameFixer
SELECT
rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.fromname, rel.categories_id,
rel.name, rel.name AS textstring, rel.predb_id, rel.searchname,
IFNULL(ph.hash, "") AS hash
IFNULL(ph.hash, \'\') AS hash
FROM releases rel
LEFT JOIN par_hashes ph ON ph.releases_id = rel.id
WHERE ph.hash != ""
WHERE ph.hash != \'\'
AND rel.nzbstatus = %d
AND rel.predb_id = 0',
NZB::NZB_ADDED
@@ -773,13 +773,13 @@ class NameFixer
SELECT
rel.id AS releases_id, rel.size AS relsize, rel.groups_id, rel.fromname, rel.categories_id,
rel.name, rel.name AS textstring, rel.predb_id, rel.searchname,
IFNULL(ph.hash, "") AS hash
IFNULL(ph.hash, \'\') AS hash
FROM releases rel
LEFT JOIN par_hashes ph ON ph.releases_id = rel.id
WHERE rel.nzbstatus = %d
AND (rel.isrenamed = %d OR rel.categories_id IN (%d, %d))
AND rel.predb_id = 0
AND ph.hash != ""
AND ph.hash != \'\'
AND rel.proc_hash16k = %d',
NZB::NZB_ADDED,
self::IS_RENAMED_NONE,
Blacklight/TmuxOutput.php
+13 -11
View File
@@ -506,17 +506,19 @@ class TmuxOutput extends Tmux
)
);
$pieces = explode(' ', $this->pdo->getAttribute(\PDO::ATTR_SERVER_INFO));
$buffer .= color("\nThreads = ")->green.
color($pieces[4])->yellow.
color(', Opens = ')->green.
color($pieces[14])->yellow.
color(', Tables = ')->green.
color($pieces[22])->yellow.
color(', Slow = ')->green.
color($pieces[11])->yellow.
color(', QPS = ')->green.
color($pieces[28])->yellow.PHP_EOL;
$info = $this->pdo->getAttribute(\PDO::ATTR_SERVER_INFO);
$pieces = [];
foreach ([
['Threads', '/.*\bThreads: (\d+)\b.*/'],
['Opens', '/.*\bOpens[^:]*?: (\d+)\b.*/'],
['Tables', '/.* tables: (\d+)\b.*/'],
['Slow', '/.*\bSlow[^:]*?: (\d+)\b.*/'],
['QPS', '/.*\bQueries[^:]*?: (\d+)\b.*/'],
] as $v) {
$pieces[] = color($v[0].' = ')->green.
color(preg_replace($v[1], '$1', $info))->yellow;
}
$buffer .= PHP_EOL.implode(', ', $pieces).PHP_EOL;
return $buffer;
}
resources/tmp/imdb_cache/.gitignore
+2
View File
@@ -0,0 +1,2 @@
*
!.gitignore