This commit is contained in:
DariusIII
2023-04-21 22:34:55 +02:00
parent 063df952cf
commit 213014ca48
8 changed files with 72 additions and 72 deletions
+4 -4
View File
@@ -118,10 +118,10 @@ class AniDB
$query->where('at.title', 'like', '%'.$animeTitle.'%');
}
$query->select(['at.anidbid', DB::raw("GROUP_CONCAT(at.title SEPARATOR ', ') AS title"), 'ai.description'])
->from('anidb_titles as at')
->leftJoin('anidb_info as ai', 'ai.anidbid', '=', 'at.anidbid')
->groupBy('at.anidbid')
->orderByDesc('at.anidbid');
->from('anidb_titles as at')
->leftJoin('anidb_info as ai', 'ai.anidbid', '=', 'at.anidbid')
->groupBy('at.anidbid')
->orderByDesc('at.anidbid');
return $query->paginate(config('nntmux.items_per_page'));
}
+3 -3
View File
@@ -268,9 +268,9 @@ class Books
Release::query()->where('nzbstatus', '=', NZB::NZB_ADDED)
->whereNull('bookinfo_id')
->whereIn('categories_id', [$iValue])
->orderByDesc('postdate')
->limit($this->bookqty)
->get(['searchname', 'id', 'categories_id']), $iValue
->orderByDesc('postdate')
->limit($this->bookqty)
->get(['searchname', 'id', 'categories_id']), $iValue
);
}
}
+5 -5
View File
@@ -136,11 +136,11 @@ class ManticoreSearch
public function updateRelease(int|string $releaseID): void
{
$new = Release::query()
->where('releases.id', $releaseID)
->leftJoin('release_files as rf', 'releases.id', '=', 'rf.releases_id')
->select(['releases.id', 'releases.name', 'releases.searchname', 'releases.fromname', 'releases.categories_id', DB::raw('IFNULL(GROUP_CONCAT(rf.name SEPARATOR " "),"") filename')])
->groupBy('releases.id')
->first();
->where('releases.id', $releaseID)
->leftJoin('release_files as rf', 'releases.id', '=', 'rf.releases_id')
->select(['releases.id', 'releases.name', 'releases.searchname', 'releases.fromname', 'releases.categories_id', DB::raw('IFNULL(GROUP_CONCAT(rf.name SEPARATOR " "),"") filename')])
->groupBy('releases.id')
->first();
if ($new !== null) {
$release = $new->toArray();
+9 -9
View File
@@ -257,17 +257,17 @@ abstract class Videos
if (! empty($title)) {
if ($source > 0) {
$query = Video::query()
->whereRaw("REPLACE(title,'\'','') = ?", $title)
->orWhereRaw("REPLACE(title,':','') = ?", $title)
->where('type', '=', $type)
->where('source', '=', $source)
->first();
->whereRaw("REPLACE(title,'\'','') = ?", $title)
->orWhereRaw("REPLACE(title,':','') = ?", $title)
->where('type', '=', $type)
->where('source', '=', $source)
->first();
} else {
$query = Video::query()
->whereRaw("REPLACE(title,'\'','') = ?", $title)
->orWhereRaw("REPLACE(title,':','') = ?", $title)
->where('type', '=', $type)
->first();
->whereRaw("REPLACE(title,'\'','') = ?", $title)
->orWhereRaw("REPLACE(title,':','') = ?", $title)
->where('type', '=', $type)
->first();
}
if (! empty($query)) {
$result = $query->toArray();
@@ -164,34 +164,34 @@ class NntmuxPopulateSearchIndexes extends Command
DB::statement('SET SESSION group_concat_max_len=16384;');
Release::query()
->orderByDesc('id')
->leftJoin('release_files', 'releases.id', '=', 'release_files.releases_id')
->select(['releases.id', 'releases.name', 'releases.searchname', 'releases.fromname', 'releases.categories_id', 'releases.postdate'])
->selectRaw('IFNULL(GROUP_CONCAT(release_files.name SEPARATOR " "),"") filename')
->groupBy('id')
->chunk($max, function ($releases) use ($bar, $data) {
foreach ($releases as $r) {
$searchName = str_replace(['.', '-'], ' ', $r->searchname);
$data['body'][] = [
'index' => [
'_index' => 'releases',
'_id' => $r->id,
],
];
$data['body'][] = [
'id' => $r->id,
'name' => $r->name,
'searchname' => $r->searchname,
'plainsearchname' => $searchName,
'fromname' => $r->fromname,
'categories_id' => $r->categories_id,
'filename' => $r->filename,
'postdate' => $r->postdate,
];
$bar->advance();
}
\Elasticsearch::bulk($data);
});
->orderByDesc('id')
->leftJoin('release_files', 'releases.id', '=', 'release_files.releases_id')
->select(['releases.id', 'releases.name', 'releases.searchname', 'releases.fromname', 'releases.categories_id', 'releases.postdate'])
->selectRaw('IFNULL(GROUP_CONCAT(release_files.name SEPARATOR " "),"") filename')
->groupBy('id')
->chunk($max, function ($releases) use ($bar, $data) {
foreach ($releases as $r) {
$searchName = str_replace(['.', '-'], ' ', $r->searchname);
$data['body'][] = [
'index' => [
'_index' => 'releases',
'_id' => $r->id,
],
];
$data['body'][] = [
'id' => $r->id,
'name' => $r->name,
'searchname' => $r->searchname,
'plainsearchname' => $searchName,
'fromname' => $r->fromname,
'categories_id' => $r->categories_id,
'filename' => $r->filename,
'postdate' => $r->postdate,
];
$bar->advance();
}
\Elasticsearch::bulk($data);
});
$bar->finish();
$this->newLine();
$this->info('Done');
+17 -17
View File
@@ -427,23 +427,23 @@ class Release extends Model
}
$releases = self::query()
->where('nzbstatus', '=', NZB::NZB_ADDED)
->select(
[
'releases.id',
'releases.name',
'releases.searchname',
'releases.size',
'releases.guid',
'releases.totalpart',
'releases.postdate',
'releases.adddate',
'releases.grabs',
'cp.title as parent_category',
'c.title as sub_category',
DB::raw('CONCAT(cp.title, ' > ', c.title) AS category_name'),
]
)
->where('nzbstatus', '=', NZB::NZB_ADDED)
->select(
[
'releases.id',
'releases.name',
'releases.searchname',
'releases.size',
'releases.guid',
'releases.totalpart',
'releases.postdate',
'releases.adddate',
'releases.grabs',
'cp.title as parent_category',
'c.title as sub_category',
DB::raw('CONCAT(cp.title, ' > ', c.title) AS category_name'),
]
)
->leftJoin('categories as c', 'c.id', '=', 'releases.categories_id')
->leftJoin('root_categories as cp', 'cp.id', '=', 'c.root_categories_id')
->orderByDesc('releases.postdate')
+3 -3
View File
@@ -39,7 +39,7 @@ class RouteServiceProvider extends ServiceProvider
protected function mapWebRoutes(): void
{
Route::middleware('web')
->group(base_path('routes/web.php'));
->group(base_path('routes/web.php'));
}
/**
@@ -50,8 +50,8 @@ class RouteServiceProvider extends ServiceProvider
protected function mapApiRoutes(): void
{
Route::prefix('api')
->middleware('api')
->group(base_path('routes/api.php'));
->middleware('api')
->group(base_path('routes/api.php'));
}
/**
@@ -53,9 +53,9 @@ class CreateTelescopeEntriesTable extends Migration
$table->index('tag');
$table->foreign('entry_uuid')
->references('uuid')
->on('telescope_entries')
->onDelete('cascade');
->references('uuid')
->on('telescope_entries')
->onDelete('cascade');
});
$this->schema->create('telescope_monitoring', function (Blueprint $table) {