Mirror/Gazelle
1
0
Fork 0
mirror of https://github.com/WhatCD/Gazelle.git synced 2025-01-05 22:10:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Empty commit

Browse Source
This commit is contained in:
Git 2013-11-11 08:00:59 +00:00
parent dcd7d38564
commit 99c3e1e954
11 changed files with 1037 additions and 2395 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
classes/torrents.class.php
View File

@ -56,7 +56,7 @@ public static function get_groups($GroupIDs, $Return = true, $GetArtists = true,
continue; continue;
} }
$Data = G::$Cache->get_value($Key . $GroupID, true); $Data = G::$Cache->get_value($Key . $GroupID, true);
if (!empty($Data) && $Data['ver'] == CACHE::GROUP_VERSION) { if (!empty($Data) && is_array($Data) && $Data['ver'] == CACHE::GROUP_VERSION) {
unset($NotFound[$GroupID]); unset($NotFound[$GroupID]);
$Found[$GroupID] = $Data['d']; $Found[$GroupID] = $Data['d'];
} }
@ -65,7 +65,6 @@ public static function get_groups($GroupIDs, $Return = true, $GetArtists = true,
if (count($GroupIDs) === 0) { if (count($GroupIDs) === 0) {
return array(); return array();
} }
$IDs = implode(',', array_keys($NotFound));
/* /*
Changing any of these attributes returned will cause very large, very dramatic site-wide chaos. Changing any of these attributes returned will cause very large, very dramatic site-wide chaos.
@ -76,6 +75,8 @@ public static function get_groups($GroupIDs, $Return = true, $GetArtists = true,
*/ */
if (count($NotFound) > 0) { if (count($NotFound) > 0) {
$IDs = implode(',', array_keys($NotFound));
$NotFound = array();
$QueryID = G::$DB->get_query_id(); $QueryID = G::$DB->get_query_id();
G::$DB->query(" G::$DB->query("
SELECT SELECT
@ -84,20 +85,12 @@ public static function get_groups($GroupIDs, $Return = true, $GetArtists = true,
WHERE g.ID IN ($IDs)"); WHERE g.ID IN ($IDs)");
while ($Group = G::$DB->next_record(MYSQLI_ASSOC, true)) { while ($Group = G::$DB->next_record(MYSQLI_ASSOC, true)) {
unset($NotFound[$Group['ID']]); $NotFound[$Group['ID']] = $Group;
$Found[$Group['ID']] = $Group; $NotFound[$Group['ID']]['Torrents'] = array();
$Found[$Group['ID']]['Torrents'] = array(); $NotFound[$Group['ID']]['Artists'] = array();
$Found[$Group['ID']]['Artists'] = array();
} }
G::$DB->set_query_id($QueryID); G::$DB->set_query_id($QueryID);
// Orphan torrents. There shouldn't ever be any
if (count($NotFound) > 0) {
foreach (array_keys($NotFound) as $GroupID) {
unset($Found[$GroupID]);
}
}
if ($Torrents) { if ($Torrents) {
$QueryID = G::$DB->get_query_id(); $QueryID = G::$DB->get_query_id();
G::$DB->query(" G::$DB->query("
@ -110,23 +103,21 @@ public static function get_groups($GroupIDs, $Return = true, $GetArtists = true,
ORDER BY GroupID, Remastered, (RemasterYear != 0) DESC, RemasterYear, RemasterTitle, ORDER BY GroupID, Remastered, (RemasterYear != 0) DESC, RemasterYear, RemasterTitle,
RemasterRecordLabel, RemasterCatalogueNumber, Media, Format, Encoding, ID"); RemasterRecordLabel, RemasterCatalogueNumber, Media, Format, Encoding, ID");
while ($Torrent = G::$DB->next_record(MYSQLI_ASSOC, true)) { while ($Torrent = G::$DB->next_record(MYSQLI_ASSOC, true)) {
$Found[$Torrent['GroupID']]['Torrents'][$Torrent['ID']] = $Torrent; $NotFound[$Torrent['GroupID']]['Torrents'][$Torrent['ID']] = $Torrent;
} }
G::$DB->set_query_id($QueryID); G::$DB->set_query_id($QueryID);
}
// Cache it all foreach ($NotFound as $GroupID => $GroupInfo) {
foreach ($Found as $GroupID => $GroupInfo) { G::$Cache->cache_value($Key . $GroupID, array('ver' => CACHE::GROUP_VERSION, 'd' => $GroupInfo), 0);
G::$Cache->cache_value("torrent_group_$GroupID",
array('ver' => CACHE::GROUP_VERSION, 'd' => $GroupInfo), 0);
G::$Cache->cache_value("torrent_group_light_$GroupID",
array('ver' => CACHE::GROUP_VERSION, 'd' => $GroupInfo), 0);
}
} else {
foreach ($Found as $Group) {
G::$Cache->cache_value('torrent_group_light_'.$Group['ID'], array('ver' => CACHE::GROUP_VERSION, 'd' => $Found[$Group['ID']]), 0);
}
} }
$Found = $NotFound + $Found;
} }
// Filter out orphans (elements that are == false)
$Found = array_filter($Found);
if ($GetArtists) { if ($GetArtists) {
$Artists = Artists::get_artists($GroupIDs); $Artists = Artists::get_artists($GroupIDs);
} else { } else {

9
sections/tools/development/clear_cache.php
View File

@ -29,29 +29,33 @@
<div class="header"> <div class="header">
<h2>Clear a cache key</h2> <h2>Clear a cache key</h2>
</div> </div>
<form class="manage_form" name="cache" method="get" action="">
<input type="hidden" name="action" value="clear_cache" />
<table class="layout" cellpadding="2" cellspacing="1" border="0" align="center"> <table class="layout" cellpadding="2" cellspacing="1" border="0" align="center">
<tr> <tr>
<td>Key</td> <td>Key</td>
<td> <td>
<form class="manage_form" name="cache" method="get" action="">
<input type="hidden" name="action" value="clear_cache" />
<select name="type"> <select name="type">
<option value="view">View</option> <option value="view">View</option>
<option value="clear">Clear</option> <option value="clear">Clear</option>
</select> </select>
<input type="text" name="key" id="key" class="inputtext" value="<?=(isset($_GET['key']) && $_GET['submit'] != 'Multi' ? display_str($_GET['key']) : '')?>" /> <input type="text" name="key" id="key" class="inputtext" value="<?=(isset($_GET['key']) && $_GET['submit'] != 'Multi' ? display_str($_GET['key']) : '')?>" />
<input type="submit" name="submit" value="Single" class="submit" /> <input type="submit" name="submit" value="Single" class="submit" />
</form>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>Multi-key</td> <td>Multi-key</td>
<td> <td>
<form class="manage_form" name="cache" method="get" action="">
<input type="hidden" name="action" value="clear_cache" />
<select name="type"> <select name="type">
<option value="view">View</option> <option value="view">View</option>
<option value="clear">Clear</option> <option value="clear">Clear</option>
</select> </select>
<textarea type="text" name="key" id="key" class="inputtext"><?=(isset($_GET['key']) && $_GET['submit'] == 'Multi' ? display_str($_GET['key']) : '')?></textarea> <textarea type="text" name="key" id="key" class="inputtext"><?=(isset($_GET['key']) && $_GET['submit'] == 'Multi' ? display_str($_GET['key']) : '')?></textarea>
<input type="submit" name="submit" value="Multi" class="submit" /> <input type="submit" name="submit" value="Multi" class="submit" />
</form>
</td> </td>
</tr> </tr>
<? <?
@ -69,6 +73,5 @@
} }
?> ?>
</table> </table>
</form>
<? <?
View::show_footer(); View::show_footer();

25
sections/torrents/add_alias.php
View File

@ -10,6 +10,15 @@
error(0); error(0);
} }
$DB->query("
SELECT Name
FROM torrents_group
WHERE ID = $GroupID");
if (!$DB->has_results()) {
error(404);
}
list($GroupName) = $DB->next_record(MYSQLI_NUM, false);
$Changed = false; $Changed = false;
for ($i = 0; $i < count($AliasNames); $i++) { for ($i = 0; $i < count($AliasNames); $i++) {
@ -45,12 +54,6 @@
$AliasID = $DB->inserted_id(); $AliasID = $DB->inserted_id();
} }
$DB->query("
SELECT Name
FROM torrents_group
WHERE ID = $GroupID");
list($GroupName) = $DB->next_record(MYSQLI_NUM, false);
$DB->query(" $DB->query("
SELECT Name SELECT Name
FROM artists_group FROM artists_group
@ -66,16 +69,6 @@
if ($DB->affected_rows()) { if ($DB->affected_rows()) {
$Changed = true; $Changed = true;
$DB->query("
INSERT INTO torrents_group (ID, NumArtists)
SELECT ta.GroupID, COUNT(ta.ArtistID)
FROM torrents_artists AS ta
WHERE ta.GroupID = '$GroupID'
AND ta.Importance = '1'
GROUP BY ta.GroupID
ON DUPLICATE KEY UPDATE
NumArtists = VALUES (NumArtists);");
Misc::write_log("Artist $ArtistID ($ArtistName) was added to the group $GroupID ($GroupName) as ".$ArtistTypes[$Importance].' by user '.$LoggedUser['ID'].' ('.$LoggedUser['Username'].')'); Misc::write_log("Artist $ArtistID ($ArtistName) was added to the group $GroupID ($GroupName) as ".$ArtistTypes[$Importance].' by user '.$LoggedUser['ID'].' ('.$LoggedUser['Username'].')');
Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "added artist $ArtistName as ".$ArtistTypes[$Importance], 0); Torrents::write_group_log($GroupID, 0, $LoggedUser['ID'], "added artist $ArtistName as ".$ArtistTypes[$Importance], 0);
} }

2056
sections/torrents/browse.php
View File

File diff suppressed because it is too large Load Diff

1206
sections/torrents/browse2.php
View File

File diff suppressed because it is too large Load Diff

13
sections/torrents/delete_alias.php
View File

@ -25,6 +25,9 @@
SELECT Name SELECT Name
FROM torrents_group FROM torrents_group
WHERE ID = $GroupID"); WHERE ID = $GroupID");
if (!$DB->has_results()) {
error(404);
}
list($GroupName) = $DB->next_record(MYSQLI_NUM, false); list($GroupName) = $DB->next_record(MYSQLI_NUM, false);
// Get a count of how many groups or requests use this artist ID // Get a count of how many groups or requests use this artist ID
@ -47,16 +50,6 @@
Artists::delete_artist($ArtistID); Artists::delete_artist($ArtistID);
} }
$DB->query("
INSERT INTO torrents_group (ID, NumArtists)
SELECT ta.GroupID, COUNT(ta.ArtistID)
FROM torrents_artists AS ta
WHERE ta.GroupID = '$GroupID'
AND ta.Importance = '1'
GROUP BY ta.GroupID
ON DUPLICATE KEY UPDATE
NumArtists = VALUES (NumArtists);");
$Cache->delete_value("torrents_details_$GroupID"); // Delete torrent group cache $Cache->delete_value("torrents_details_$GroupID"); // Delete torrent group cache
$Cache->delete_value("groups_artists_$GroupID"); // Delete group artist cache $Cache->delete_value("groups_artists_$GroupID"); // Delete group artist cache
Misc::write_log('Artist ('.$ArtistTypes[$Importance].") $ArtistID ($ArtistName) was removed from the group $GroupID ($GroupName) by user ".$LoggedUser['ID'].' ('.$LoggedUser['Username'].')'); Misc::write_log('Artist ('.$ArtistTypes[$Importance].") $ArtistID ($ArtistName) was removed from the group $GroupID ($GroupName) by user ".$LoggedUser['ID'].' ('.$LoggedUser['Username'].')');

6
sections/torrents/index.php
View File

@ -228,7 +228,7 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
header("Location: torrents.php?id=$GroupID&torrentid=".$_GET['torrentid']); header("Location: torrents.php?id=$GroupID&torrentid=".$_GET['torrentid']);
} }
} else { } else {
include(SERVER_ROOT.'/sections/torrents/browse2.php'); include(SERVER_ROOT.'/sections/torrents/browse.php');
} }
break; break;
} }
@ -259,10 +259,10 @@ function js_pages($Action, $TorrentID, $NumResults, $CurrentPage) {
if ($GroupID) { if ($GroupID) {
header("Location: torrents.php?id=$GroupID"); header("Location: torrents.php?id=$GroupID");
} else { } else {
include(SERVER_ROOT.'/sections/torrents/browse2.php'); include(SERVER_ROOT.'/sections/torrents/browse.php');
} }
} else { } else {
include(SERVER_ROOT.'/sections/torrents/browse2.php'); include(SERVER_ROOT.'/sections/torrents/browse.php');
} }
} }
?> ?>

15
sections/torrents/takechangecategory.php
View File

@ -25,7 +25,6 @@
if (empty($Year) || empty($ArtistName) || !is_number($Year) || empty($ReleaseType) || !is_number($ReleaseType)) { if (empty($Year) || empty($ArtistName) || !is_number($Year) || empty($ReleaseType) || !is_number($ReleaseType)) {
error(0); error(0);
} }
$SearchText = "$ArtistName $Title $Year";
$DB->query(" $DB->query("
SELECT ArtistID, AliasID, Redirect, Name SELECT ArtistID, AliasID, Redirect, Name
FROM artists_alias FROM artists_alias
@ -49,9 +48,9 @@
$DB->query(" $DB->query("
INSERT INTO torrents_group INSERT INTO torrents_group
(ArtistID, NumArtists, CategoryID, Name, Year, ReleaseType, Time, WikiBody, WikiImage, SearchText) (ArtistID, CategoryID, Name, Year, ReleaseType, Time, WikiBody, WikiImage)
VALUES VALUES
($ArtistID, '1', '1', '$Title', '$Year', '$ReleaseType', '".sqltime()."', '', '', '$SearchText')"); ($ArtistID, '1', '$Title', '$Year', '$ReleaseType', '".sqltime()."', '', '')");
$GroupID = $DB->inserted_id(); $GroupID = $DB->inserted_id();
$DB->query(" $DB->query("
@ -66,24 +65,22 @@
if (empty($Year) || !is_number($Year)) { if (empty($Year) || !is_number($Year)) {
error(0); error(0);
} }
$SearchText = "$Title $Year";
$DB->query(" $DB->query("
INSERT INTO torrents_group INSERT INTO torrents_group
(CategoryID, Name, Year, Time, WikiBody, WikiImage, SearchText) (CategoryID, Name, Year, Time, WikiBody, WikiImage)
VALUES VALUES
($NewCategoryID, '$Title', '$Year', '".sqltime()."', '', '', '$SearchText')"); ($NewCategoryID, '$Title', '$Year', '".sqltime()."', '', '')");
$GroupID = $DB->inserted_id(); $GroupID = $DB->inserted_id();
break; break;
case 'Applications': case 'Applications':
case 'Comics': case 'Comics':
case 'E-Books': case 'E-Books':
case 'E-Learning Videos': case 'E-Learning Videos':
$SearchText = $Title;
$DB->query(" $DB->query("
INSERT INTO torrents_group INSERT INTO torrents_group
(CategoryID, Name, Time, WikiBody, WikiImage, SearchText) (CategoryID, Name, Time, WikiBody, WikiImage)
VALUES VALUES
($NewCategoryID, '$Title', '".sqltime()."', '', '', '$SearchText')"); ($NewCategoryID, '$Title', '".sqltime()."', '', '')");
$GroupID = $DB->inserted_id(); $GroupID = $DB->inserted_id();
break; break;
} }

5
sections/torrents/takenewgroup.php
View File

@ -15,7 +15,6 @@
$ArtistName = db_string(trim($_POST['artist'])); $ArtistName = db_string(trim($_POST['artist']));
$Title = db_string(trim($_POST['title'])); $Title = db_string(trim($_POST['title']));
$Year = trim($_POST['year']); $Year = trim($_POST['year']);
$SearchText = db_string(trim($_POST['artist']) . ' ' . trim($_POST['title']) . ' ' . trim($_POST['year']));
if (!is_number($OldGroupID) || !is_number($TorrentID) || !is_number($Year) || !$OldGroupID || !$TorrentID || !$Year || empty($Title) || empty($ArtistName)) { if (!is_number($OldGroupID) || !is_number($TorrentID) || !is_number($Year) || !$OldGroupID || !$TorrentID || !$Year || empty($Title) || empty($ArtistName)) {
error(0); error(0);
@ -71,9 +70,9 @@
$DB->query(" $DB->query("
INSERT INTO torrents_group INSERT INTO torrents_group
(ArtistID, NumArtists, CategoryID, Name, Year, Time, WikiBody, WikiImage, SearchText) (ArtistID, CategoryID, Name, Year, Time, WikiBody, WikiImage)
VALUES VALUES
($ArtistID, '1', '1', '$Title', '$Year', '".sqltime()."', '', '', '$SearchText')"); ($ArtistID, '1', '$Title', '$Year', '".sqltime()."', '', '')");
$GroupID = $DB->inserted_id(); $GroupID = $DB->inserted_id();
$DB->query(" $DB->query("

6
sections/upload/upload_handle.php
View File

@ -348,8 +348,6 @@
} }
} }
$SearchText = db_string(trim($Properties['Artist']).' '.trim($Properties['Title']).' '.trim($Properties['Year']));
//******************************************************************************// //******************************************************************************//
//--------------- Generate torrent file ----------------------------------------// //--------------- Generate torrent file ----------------------------------------//
@ -575,9 +573,9 @@
// Create torrent group // Create torrent group
$DB->query(" $DB->query("
INSERT INTO torrents_group INSERT INTO torrents_group
(ArtistID, CategoryID, Name, Year, RecordLabel, CatalogueNumber, Time, WikiBody, WikiImage, SearchText, ReleaseType, VanityHouse) (ArtistID, CategoryID, Name, Year, RecordLabel, CatalogueNumber, Time, WikiBody, WikiImage, ReleaseType, VanityHouse)
VALUES VALUES
(0, $TypeID, ".$T['Title'].", $T[Year], $T[RecordLabel], $T[CatalogueNumber], '".sqltime()."', '".db_string($Body)."', $T[Image], '$SearchText', $T[ReleaseType], $T[VanityHouse])"); (0, $TypeID, ".$T['Title'].", $T[Year], $T[RecordLabel], $T[CatalogueNumber], '".sqltime()."', '".db_string($Body)."', $T[Image], $T[ReleaseType], $T[VanityHouse])");
$GroupID = $DB->inserted_id(); $GroupID = $DB->inserted_id();
if ($Type == 'Music') { if ($Type == 'Music') {
foreach ($ArtistForm as $Importance => $Artists) { foreach ($ArtistForm as $Importance => $Artists) {

10
static/functions/browse.js
View File

@ -216,16 +216,6 @@ function toggleTorrentSearch(mode) {
return false; return false;
} }
// For /sections/torrents/browse.php (not browse2.php)
function Bitrate() {
$('#other_bitrate').raw().value = '';
if ($('#bitrate').raw().options[$('#bitrate').raw().selectedIndex].value == 'Other') {
$('#other_bitrate_span').gshow();
} else {
$('#other_bitrate_span').ghide();
}
}
var ArtistFieldCount = 1; var ArtistFieldCount = 1;
function AddArtistField() { function AddArtistField() {