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

Update ES predb searches

Browse Source
This commit is contained in:
DariusIII
2020-04-16 14:51:57 +02:00
parent 9976039284
commit f07092b27a
4 changed files with 109 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Blacklight/processing/post/ProcessAdditional.php
+8 -45
View File
@@ -9,6 +9,7 @@ use App\Models\Settings;
use App\Models\UsenetGroup;
use Blacklight\Categorize;
use Blacklight\ColorCLI;
use Blacklight\ElasticSearchSiteSearch;
use Blacklight\NameFixer;
use Blacklight\Nfo;
use Blacklight\NNTP;
@@ -391,6 +392,10 @@ class ProcessAdditional
* @var \Mhor\MediaInfo\MediaInfo
*/
private $mediaInfo;
/**
* @var ElasticSearchSiteSearch
*/
private $elasticsearch;
/**
* ProcessAdditional constructor.
@@ -428,6 +433,7 @@ class ProcessAdditional
$this->_par2Info = new Par2Info();
$this->_nfo = $options['Nfo'] ?? new Nfo();
$this->sphinx = $options['SphinxSearch'] ?? new SphinxSearch();
$this->elasticsearch = new ElasticSearchSiteSearch();
$this->ffmpeg = FFMpeg::create(['timeout' => Settings::settingValue('..timeoutseconds')]);
$this->ffprobe = FFProbe::create();
$this->mediaInfo = new MediaInfo();
@@ -1176,33 +1182,7 @@ class ProcessAdditional
}
if ($this->_addedFileInfo > 0) {
if (config('nntmux.elasticsearch_enabled') === true) {
$new = Release::query()
->where('releases.id', $this->_release->id)
->leftJoin('release_files as rf', 'releases.id', '=', 'rf.releases_id')
->select(['releases.id', 'releases.name', 'releases.searchname', 'releases.fromname', DB::raw('IFNULL(GROUP_CONCAT(rf.name SEPARATOR " "),"") filename')])
->groupBy('releases.id')
->first();
if ($new !== null) {
$searchName = str_replace(['.', '-'], ' ', $new->searchname);
$data = [
'body' => [
'doc' => [
'id' => $this->_release->id,
'name' => $new->name,
'searchname' => $new->searchname,
'plainsearchname' => $searchName,
'fromname' => $new->fromname,
'filename' => ! empty($new->filename) ? $new->filename : '',
],
'doc_as_upsert' => true,
],
'index' => 'releases',
'id' => $this->_release->id,
];
\Elasticsearch::update($data);
}
$this->elasticsearch->updateRelease($this->_release->id);
} else {
$this->sphinx->updateRelease($this->_release->id);
}
@@ -1768,24 +1748,7 @@ class ProcessAdditional
$release->retag($newCat['tags']);
if (config('nntmux.elasticsearch_enabled') === true) {
$newTitleDotless = str_replace(['.', '-'], ' ', $newTitle);
$data = [
'body' => [
'doc' => [
'id' => $this->_release->id,
'name' => $this->_release->name,
'searchname' => $newTitle,
'plainsearchname' => $newTitleDotless,
'fromname' => $this->_release->fromname,
],
'doc_as_upsert' => true,
],
'index' => 'releases',
'id' => $this->_release->id,
];
\Elasticsearch::update($data);
$this->elasticsearch->updateRelease($this->_release->id);
} else {
$this->sphinx->updateRelease($this->_release->id);
}