diff --git a/admin/src/views/exam/form.vue b/admin/src/views/exam/form.vue index 937fcbd2..8691400c 100644 --- a/admin/src/views/exam/form.vue +++ b/admin/src/views/exam/form.vue @@ -66,14 +66,14 @@ - + No Yes - + { if (vaild) { let params = state.formData; + console.log(params) if (params.begin) { params.begin = dayjs(params.begin).format('YYYY-MM-DD HH:mm:ss') } if (params.end) { params.end = dayjs(params.end).format('YYYY-MM-DD HH:mm:ss') } - if (params.filters.register_time_range[0]) { + if (params.filters.register_time_range && params.filters.register_time_range[0]) { params.filters.register_time_range[0] = dayjs(params.filters.register_time_range[0]).format('YYYY-MM-DD HH:mm:ss') } - if (params.filters.register_time_range[1]) { + if (params.filters.register_time_range && params.filters.register_time_range[1]) { params.filters.register_time_range[1] = dayjs(params.filters.register_time_range[1]).format('YYYY-MM-DD HH:mm:ss') } console.log(params) diff --git a/app/Console/Commands/ExamUpdateProgress.php b/app/Console/Commands/ExamUpdateProgress.php new file mode 100644 index 00000000..bcc78745 --- /dev/null +++ b/app/Console/Commands/ExamUpdateProgress.php @@ -0,0 +1,48 @@ +argument('uid'); + $examRep = new ExamRepository(); + $result = $examRep->updateProgress($uid); + $this->info(REQUEST_ID . ", result: " . var_export($result, true)); + return 0; + } +} diff --git a/app/Console/Commands/Test.php b/app/Console/Commands/Test.php index 415434a2..7f9e4baf 100644 --- a/app/Console/Commands/Test.php +++ b/app/Console/Commands/Test.php @@ -53,7 +53,10 @@ class Test extends Command */ public function handle() { - + $examRep = new ExamRepository(); + $examuser = ExamUser::query()->findOrFail(2); + $r = $examRep->updateProgress($examuser); + dd($r); } } diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index bdf56389..1d3e2065 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -83,6 +83,7 @@ class Handler extends ExceptionHandler $msg = 'Server Error'; } if (config('app.debug')) { + $msg = $e->getMessage(); $data['trace'] = $e->getTraceAsString(); } return new JsonResponse( diff --git a/app/Http/Resources/ExamResource.php b/app/Http/Resources/ExamResource.php index e8968d49..069b1288 100644 --- a/app/Http/Resources/ExamResource.php +++ b/app/Http/Resources/ExamResource.php @@ -25,7 +25,7 @@ class ExamResource extends JsonResource 'end' => $this->end, 'duration' => $this->duration ?: '', 'duration_text' => $this->duration_text, - 'filters' => $this->filters, + 'filters' => $this->normalizeFilters($this->resource), 'filters_formatted' => $this->formatFilters($this->resource), 'indexes' => $this->indexes, 'indexes_formatted' => $this->formatIndexes($this->resource), @@ -36,6 +36,17 @@ class ExamResource extends JsonResource ]; } + private function normalizeFilters(Exam $exam) + { + $filters = $exam->filters; + foreach (Exam::$filters as $key => $value) { + if (!isset($filters->$key)) { + $filters->$key = []; + } + } + return $filters; + } + private function formatFilters(Exam $exam) { $currentFilters = $exam->filters; diff --git a/app/Models/Exam.php b/app/Models/Exam.php index 6de29111..0a6ecdef 100644 --- a/app/Models/Exam.php +++ b/app/Models/Exam.php @@ -37,10 +37,10 @@ class Exam extends NexusModel const INDEX_SEED_BONUS = 4; public static $indexes = [ - self::INDEX_UPLOADED => ['name' => 'Uploaded', 'unit' => 'GB'], - self::INDEX_SEED_TIME_AVERAGE => ['name' => 'Seed time average', 'unit' => 'Hour'], - self::INDEX_DOWNLOADED => ['name' => 'Downloaded', 'unit' => 'GB'], - self::INDEX_SEED_BONUS => ['name' => 'Seed bonus', 'unit' => ''], + self::INDEX_UPLOADED => ['name' => 'Uploaded', 'unit' => 'GB', 'source_user_field' => 'uploaded'], + self::INDEX_SEED_TIME_AVERAGE => ['name' => 'Seed time average', 'unit' => 'Hour', 'source_user_field' => 'seedtime'], + self::INDEX_DOWNLOADED => ['name' => 'Downloaded', 'unit' => 'GB', 'source_user_field' => 'downloaded'], + self::INDEX_SEED_BONUS => ['name' => 'Seed bonus', 'unit' => '', 'source_user_field' => 'seedbonus'], ]; const FILTER_USER_CLASS = 'classes'; @@ -50,7 +50,7 @@ class Exam extends NexusModel public static $filters = [ self::FILTER_USER_CLASS => ['name' => 'User class'], self::FILTER_USER_REGISTER_TIME_RANGE => ['name' => 'User register time range'], - self::FILTER_USER_DONATE => ['name' => 'User donate'], + self::FILTER_USER_DONATE => ['name' => 'User donated'], ]; protected static function booted() diff --git a/app/Models/ExamIndexInitValue.php b/app/Models/ExamIndexInitValue.php deleted file mode 100644 index 64dcd653..00000000 --- a/app/Models/ExamIndexInitValue.php +++ /dev/null @@ -1,10 +0,0 @@ -checkIndexes($params); $this->checkBeginEnd($params); + $this->checkFilters($params); $valid = $this->listValid(null, Exam::DISCOVERED_YES); if ($valid->isNotEmpty() && $params['status'] == Exam::STATUS_ENABLED) { throw new NexusException("Enabled and discovered exam already exists."); @@ -43,6 +45,7 @@ class ExamRepository extends BaseRepository { $this->checkIndexes($params); $this->checkBeginEnd($params); + $this->checkFilters($params); $valid = $this->listValid($id, Exam::DISCOVERED_YES); if ($valid->isNotEmpty() && $params['status'] == Exam::STATUS_ENABLED) { throw new NexusException("Enabled and discovered exam already exists."); @@ -52,7 +55,7 @@ class ExamRepository extends BaseRepository return $exam; } - private function checkIndexes(array $params) + private function checkIndexes(array $params): bool { if (empty($params['indexes'])) { throw new \InvalidArgumentException("Require index."); @@ -75,7 +78,7 @@ class ExamRepository extends BaseRepository return true; } - private function checkBeginEnd(array $params) + private function checkBeginEnd(array $params): bool { if (!empty($params['begin']) && !empty($params['end']) && empty($params['duration'])) { return true; @@ -87,6 +90,54 @@ class ExamRepository extends BaseRepository throw new \InvalidArgumentException("Require begin and end or only duration."); } + private function checkFilters(array $params) + { + $filters = $params['filters']; + $hasValid = false; + + $filter = Exam::FILTER_USER_CLASS; + if (!empty($filters[$filter])) { + $hasValid = true; + $diff = array_diff($filters[$filter], array_keys(User::$classes)); + if (!empty($diff)) { + throw new \InvalidArgumentException(sprintf('Invalid user class: %s', json_encode($diff))); + } + } + + $filter = Exam::FILTER_USER_DONATE; + if (!empty($filters[$filter])) { + $hasValid = true; + $diff = array_diff($filters[$filter], array_keys(User::$donateStatus)); + if (!empty($diff)) { + throw new \InvalidArgumentException(sprintf('Invalid user donate status: %s', json_encode($diff))); + } + } + + $filter = Exam::FILTER_USER_REGISTER_TIME_RANGE; + $begin = $filters[$filter][0] ?? null; + $end = $filters[$filter][1] ?? null; + if ($begin) { + if (strtotime($begin)) { + $hasValid = true; + } else { + throw new \InvalidArgumentException("Invalid user register time begin: $begin" ); + } + } + if ($end) { + if (strtotime($end)) { + $hasValid = true; + } else { + throw new \InvalidArgumentException("Invalid user register time end: $end"); + } + } + + if (!$hasValid) { + throw new \InvalidArgumentException("No valid filters"); + } + + return true; + } + public function getDetail($id) { $exam = Exam::query()->findOrFail($id); @@ -167,7 +218,7 @@ class ExamRepository extends BaseRepository return $matched; } - private function isExamMatchUser(Exam $exam, $user) + private function isExamMatchUser(Exam $exam, $user): bool { if (!$user instanceof User) { $user = User::query()->findOrFail(intval($user), ['id', 'username', 'added', 'class']); @@ -176,55 +227,30 @@ class ExamRepository extends BaseRepository $filters = $exam->filters; $filter = Exam::FILTER_USER_CLASS; - if (empty($filters->{$filter})) { - do_log("$logPrefix, exam: {$exam->id} no class"); - return false; - } - if (!in_array($user->class, $filters->{$filter})) { + if (!empty($filters->{$filter}) && !in_array($user->class, $filters->{$filter})) { do_log("$logPrefix, user class: {$user->class} not in: " . json_encode($filters->{$filter})); return false; } $filter = Exam::FILTER_USER_DONATE; - if (empty($filters->{$filter})) { - do_log("$logPrefix, exam: {$exam->id} no donate"); - return false; - } - if (!in_array($user->donate_status, $filters->{$filter})) { + if (!empty($filters->{$filter}) && !in_array($user->donate_status, $filters->{$filter})) { do_log("$logPrefix, user donate status: {$user->donate_status} not in: " . json_encode($filters->{$filter})); return false; } - $filter = Exam::FILTER_USER_REGISTER_TIME_RANGE; - if (empty($filters->{$filter})) { - do_log("$logPrefix, exam: {$exam->id} no register time range"); - return false; - } - if (!$user->added) { - do_log("$logPrefix, user no added time", 'warning'); - return false; - } $added = $user->added->toDateTimeString(); $registerTimeBegin = isset($filters->{$filter}[0]) ? Carbon::parse($filters->{$filter}[0])->toDateTimeString() : ''; $registerTimeEnd = isset($filters->{$filter}[1]) ? Carbon::parse($filters->{$filter}[1])->toDateTimeString() : ''; - if (empty($registerTimeBegin)) { - do_log("$logPrefix, exam: {$exam->id} no register_time_begin"); + if (!empty($registerTimeBegin) && $added < $registerTimeBegin) { + do_log("$logPrefix, user added: $added not bigger than begin: " . $registerTimeBegin); return false; } - if ($added < $registerTimeBegin) { - do_log("$logPrefix, user added: $added not after: " . $registerTimeBegin); + if (!empty($registerTimeEnd) && $added > $registerTimeEnd) { + do_log("$logPrefix, user added: $added not less than end: " . $registerTimeEnd); return false; } - if (empty($registerTimeEnd)) { - do_log("$logPrefix, exam: {$exam->id} no register_time_end"); - return false; - } - if ($added > $registerTimeEnd) { - do_log("$logPrefix, user added: $added not before: " . $registerTimeEnd); - return false; - } return true; } @@ -374,10 +400,36 @@ class ExamRepository extends BaseRepository return true; } + /** + * in exam_progress table + * old version: value is an increment + * new version: both value and init_value are cumulative, increment = value - init_value + * + * in exam_users table, progress field always is increment + * old version: progress = sum(exam_progress.value) + * new version：progress = exam_progress.value - exam_progress.init_value + * + * @param $examUser + * @param null $user + * @return bool + */ public function updateProgress($examUser, $user = null) { if (!$examUser instanceof ExamUser) { - $examUser = ExamUser::query()->findOrFail((int)$examUser); + $uid = intval($examUser); + $examUser = ExamUser::query() + ->where('uid', $uid) + ->where('status', ExamUser::STATUS_NORMAL) + ->get(); + if ($examUser->isEmpty()) { + do_log("user: $uid no exam."); + return false; + } + if ($examUser->count() > 1) { + do_log("user: $uid more than one active exam."); + return false; + } + $examUser = $examUser->first(); } $exam = $examUser->exam; if (!$user instanceof User) { @@ -397,71 +449,100 @@ class ExamRepository extends BaseRepository if (empty($end)) { throw new \InvalidArgumentException("$logPrefix, exam: {$examUser->id} no end."); } - $currentProgrss = []; - foreach ($exam->indexes as $key => $index) { + $examUserProgressFieldData = []; + foreach ($exam->indexes as $index) { if (!isset($index['checked']) || !$index['checked']) { continue; } - $attributes['index'] = $index['index']; - if ($index['index'] == Exam::INDEX_UPLOADED) { - $attributes['value'] = $user->uploaded; - } elseif ($index['index'] == Exam::INDEX_DOWNLOADED) { - $attributes['value'] = $user->downloaded; - } elseif ($index['index'] == Exam::INDEX_SEED_BONUS) { - $attributes['value'] = $user->seedbonus; - } elseif ($index['index'] == Exam::INDEX_SEED_TIME_AVERAGE) { - $torrentCountsRes = Snatch::query() - ->where('userid', $user->id) - ->where('completedat', '>=', $begin) - ->where('completedat', '<=', $end) - ->selectRaw("count(distinct(torrentid)) as torrent_counts") - ->first(); - do_log("$logPrefix, torrentCountsRes: " . json_encode($torrentCountsRes)); - if ($torrentCountsRes && $torrentCountsRes->torrent_counts > 0) { - $value = $user->seedtime / $torrentCountsRes->torrent_counts; - } else { - $value = 0; - } - $attributes['value'] = $value; - } else { + if (!isset(Exam::$indexes[$index['index']])) { $msg = "Unknown index: {$index['index']}"; do_log("$logPrefix, $msg", 'error'); throw new \RuntimeException($msg); } - //at the begining, value = init_value, and then value increase. - $progress = ExamProgress::query() + do_log("$logPrefix, handling index: " . json_encode($index)); + //First, collect data to store/update in table: exam_progress + $attributes['index'] = $index['index']; + $attributes['value'] = $user->{Exam::$indexes[$index['index']]['source_user_field']}; + do_log("get total value: " . $attributes['value']); + $newVersionProgress = ExamProgress::query() ->where('exam_user_id', $examUser->id) ->where('torrent_id', -1) ->where('index', $index['index']) ->orderBy('id', 'desc') ->first(); - if ($progress) { - //do update - $progress->update(['value' => $attributes['value']]); - do_log("$logPrefix, doUpdat: " . last_query()); + do_log("check newVersionProgress: " . last_query() . ", exists: " . json_encode($newVersionProgress)); + if ($newVersionProgress) { + //just need to do update the value + if ($attributes['value'] != $newVersionProgress->value) { + $newVersionProgress->update(['value' => $attributes['value']]); + do_log("newVersionProgress exists, doUpdate: " . last_query()); + } else { + do_log("newVersionProgress exists, no change...."); + } + $attributes['init_value'] = $newVersionProgress->init_value; } else { - //do insert - $attributes['init_value'] = $attributes['value']; + //do insert. check the init value + $progressData = $this->calculateProgress($examUser, true); + $increment = $progressData[$index['index']] ?? 0; + $initValue = $attributes['value'] - $increment; + $attributes['init_value'] = max($initValue, 0); + do_log("total: {$attributes['value']}, increment: $increment, init_value: $initValue, final init_value: {$attributes['init_value']}"); $attributes['torrent_id'] = -1; ExamProgress::query()->insert($attributes); - do_log("$logPrefix, doInsert with: " . json_encode($attributes)); + do_log("newVersionProgress NOT exists, doInsert with: " . json_encode($attributes)); + } + + //Second, update exam_user.progress + if ($index['index'] == Exam::INDEX_SEED_TIME_AVERAGE) { + $torrentCountsRes = Snatch::query() + ->where('userid', $user->id) + ->where('completedat', '>=', $begin) + ->where('completedat', '<=', $end) + ->selectRaw("count(distinct(torrentid)) as counts") + ->first(); + $torrentCounts = $torrentCountsRes ? $torrentCountsRes->counts : 0; + do_log("special index: {$index['index']}, get torrent count: $torrentCounts by: " . last_query()); + if ($torrentCounts > 0) { + $examUserProgressFieldData[$index['index']] = ($attributes['value'] - $attributes['init_value']) / $torrentCounts; + do_log(sprintf( + "torrentCounts > 0, examUserProgress: (total(%s) - init_value(%s)) / %s = %s", + $attributes['value'], $attributes['init_value'], $torrentCounts, $examUserProgressFieldData[$index['index']] + )); + } else { + $examUserProgressFieldData[$index['index']] = 0; + do_log("torrentCounts = 0, examUserProgress: 0"); + } + } else { + $examUserProgressFieldData[$index['index']] = $attributes['value'] - $attributes['init_value']; + do_log(sprintf( + "normal index: {$index['index']}, examUserProgress: total(%s) - init_value(%s) = %s", + $attributes['value'], $attributes['init_value'], $examUserProgressFieldData[$index['index']] + )); } - $currentProgrss[$index['index']] = $attributes['value']; } - $examProgressFormatted = $this->getProgressFormatted($exam, $currentProgrss); + $examProgressFormatted = $this->getProgressFormatted($exam, $examUserProgressFieldData); $examNotPassed = array_filter($examProgressFormatted, function ($item) { return !$item['passed']; }); + $update = [ - 'progress' => $currentProgrss, + 'progress' => $examUserProgressFieldData, 'is_done' => count($examNotPassed) ? ExamUser::IS_DONE_NO : ExamUser::IS_DONE_YES, ]; - do_log("[UPDATE_PROGRESS] " . nexus_json_encode($update)); - $examUser->update($update); - + $result = $examUser->update($update); + do_log("[UPDATE_PROGRESS] " . nexus_json_encode($update) . ", result: " . var_export($result, true)); return true; } + + /** + * get user exam status + * + * @param $uid + * @param null $status + * @param string[] $with + * @return mixed|null + */ public function getUserExamProgress($uid, $status = null, $with = ['exam', 'user']) { $logPrefix = "uid: $uid"; @@ -490,7 +571,13 @@ class ExamRepository extends BaseRepository return $examUser; } - public function calculateProgress(ExamUser $examUser) + /** + * @deprecated old version used + * @param ExamUser $examUser + * @param false $allSum + * @return array|null + */ + public function calculateProgress(ExamUser $examUser, $allSum = false) { $logPrefix = "examUser: " . $examUser->id; $begin = $examUser->begin; @@ -512,6 +599,9 @@ class ExamRepository extends BaseRepository ->pluck('sum', 'index') ->toArray(); $logPrefix .= ", progressSum raw: " . json_encode($progressSum) . ", query: " . last_query(); + if ($allSum) { + return $progressSum; + } $index = Exam::INDEX_SEED_TIME_AVERAGE; if (isset($progressSum[$index])) { @@ -619,18 +709,33 @@ class ExamRepository extends BaseRepository ->selectRaw("$userTable.*") ->orderBy("$userTable.id", "asc"); - if (empty($filters->classes)) { - do_log("{$exam->id} no classes."); - return false; - } else { - $baseQuery->whereIn("$userTable.class", $filters->classes); + $filter = Exam::FILTER_USER_CLASS; + if (!empty($filters->$filter)) { + $baseQuery->whereIn("$userTable.class", $filters->$filter); } - if (empty($filters->register_time_range) || empty($filters->register_time_range[0]) || empty($filters->register_time_range[1])) { - do_log("{$exam->id} no register_time_range."); - return false; - } else { - $baseQuery->where("$userTable.added", ">=", Carbon::parse($filters->register_time_range[0])->toDateTimeString()) - ->where("$userTable.added", '<=', Carbon::parse($filters->register_time_range[1])->toDateTimeString()); + + $filter = Exam::FILTER_USER_DONATE; + if (!empty($filters->$filter) && count($filters->$filter) == 1) { + $donateStatus = $filters->$filter[0]; + if ($donateStatus == User::DONATE_YES) { + $baseQuery->where("$userTable.donoruntil", ">=", Carbon::now()->toDateTimeString()); + } elseif ($donateStatus == User::DONATE_NO) { + $baseQuery->whereNull("$userTable.donoruntil"); + } else { + do_log("{$exam->id} filter $filter: $donateStatus invalid.", "error"); + return false; + } + } + + $filter = Exam::FILTER_USER_REGISTER_TIME_RANGE; + $range = $filters->$filter; + if (!empty($range)) { + /** + * begin and end will be exists at the same time + * @see checkBeginEnd() + */ + $baseQuery->where("$userTable.added", ">=", Carbon::parse($range[0])->toDateTimeString()) + ->where("$userTable.added", '<=', Carbon::parse($range[1])->toDateTimeString()); } $size = 1000; @@ -644,15 +749,10 @@ class ExamRepository extends BaseRepository do_log("no more data..."); break; } - $insert = []; $now = Carbon::now()->toDateTimeString(); foreach ($users as $user) { $minId = $user->id; $currentLogPrefix = sprintf("$logPrefix, user: %s", $user->id); -// if (!$this->isExamMatchUser($exam, $user)) { -// do_log("$currentLogPrefix, exam not match this user."); -// continue; -// } $insert = [ 'uid' => $user->id, 'exam_id' => $exam->id, diff --git a/include/cleanup.php b/include/cleanup.php index f327f2ce..58af31aa 100644 --- a/include/cleanup.php +++ b/include/cleanup.php @@ -287,7 +287,7 @@ function docleanup($forceAll = 0, $printProgress = false) { $all_bonus = $all_bonus * $donortimes_bonus; KPS("+",$all_bonus,$arr["userid"]); //update exam progress - $examRep->addProgress($arr["userid"], 0, [\App\Models\Exam::INDEX_SEED_BONUS => $all_bonus]); + $examRep->updateProgress($arr['userid']); } } $log = 'calculate seeding bonus'; diff --git a/include/functions.php b/include/functions.php index db249aba..8b2fa51e 100644 --- a/include/functions.php +++ b/include/functions.php @@ -4726,7 +4726,7 @@ function displayHotAndClassic() $thumbnail = "" . (addslashes($array['name'] . $pro_torrent)) . "
".(addslashes($array['small_descr'])) .""). "', 'trail', true, 'delay', 0,'lifetime',5000,'styleClass','niceTitle','maxWidth', 600);\">" . $thumbnail . ""; $movies_list .= $thumbnail; $count++; - if ($count >= 9) + if ($count >= 10) break; } ?> diff --git a/nexus/Install/Update.php b/nexus/Install/Update.php index 0c1c2501..8e0e8cd0 100644 --- a/nexus/Install/Update.php +++ b/nexus/Install/Update.php @@ -101,6 +101,10 @@ class Update extends Install } } + if (WITH_LARAVEL && VERSION_NUMBER == '1.6.0-beta9') { + $this->migrateExamProgress(); + } + } public function migrateExamProgress() @@ -162,8 +166,19 @@ class Update extends Install 'created_at' => date('Y-m-d H:i:s'), 'updated_at' => date('Y-m-d H:i:s'), ]; - NexusDB::table('exam_progress')->insert($insert); - $log = "$currentLogPrefix, insert index: $index progress: " . json_encode($insert); + $exists = NexusDB::table('exam_progress') + ->where('exam_user_id', $examUser->id) + ->where('index', $insert) + ->where('torrent_id', -1) + ->orderBy('id', 'desc') + ->first(); + if ($exists) { + NexusDB::table('exam_progress')->where('id', $exists->id)->update($insert); + $log = "$currentLogPrefix, progress exists: {$exists->id}, update index: $index progress: " . json_encode($insert); + } else { + NexusDB::table('exam_progress')->insert($insert); + $log = "$currentLogPrefix, insert index: $index progress: " . json_encode($insert); + } $this->doLog($log); } } diff --git a/public/announce.php b/public/announce.php index 93751a1c..121c2f1d 100644 --- a/public/announce.php +++ b/public/announce.php @@ -209,7 +209,6 @@ if (!isset($self)) if(isset($self) && $self['prevts'] > (TIMENOW - $announce_wait)) err('There is a minimum announce time of ' . $announce_wait . ' seconds'); -$examIndexData = []; // current peer_id, or you could say session with tracker not found in table peers if (!isset($self)) { @@ -276,9 +275,6 @@ else // continue an existing session do_log("upthis: $upthis, downthis: $downthis, announcetime: $announcetime, is_cheater: $is_cheater"); - if (!$is_cheater) { - $examIndexData[\App\Models\Exam::INDEX_SEED_TIME_AVERAGE] = $self['announcetime']; - } if (!$is_cheater && ($trueupthis > 0 || $truedownthis > 0)) { $global_promotion_state = get_global_sp_state(); @@ -288,20 +284,15 @@ else // continue an existing session { $USERUPDATESET[] = "uploaded = uploaded + 2*$trueupthis"; $USERUPDATESET[] = "downloaded = downloaded + $truedownthis"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = 2 * $trueupthis; - $examIndexData[\App\Models\Exam::INDEX_DOWNLOADED] = $truedownthis; } elseif($torrent['sp_state']==4) //2X Free { $USERUPDATESET[] = "uploaded = uploaded + 2*$trueupthis"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = 2 * $trueupthis; } elseif($torrent['sp_state']==6) //2X 50% { $USERUPDATESET[] = "uploaded = uploaded + 2*$trueupthis"; $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = 2 * $trueupthis; - $examIndexData[\App\Models\Exam::INDEX_DOWNLOADED] = $truedownthis / 2; } else{ if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0) @@ -310,28 +301,21 @@ else // continue an existing session if($torrent['sp_state']==2) //Free { $USERUPDATESET[] = "uploaded = uploaded + $upthis"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = $upthis; } elseif($torrent['sp_state']==5) //50% { $USERUPDATESET[] = "uploaded = uploaded + $upthis"; $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = $upthis; - $examIndexData[\App\Models\Exam::INDEX_DOWNLOADED] = $truedownthis / 2; } elseif($torrent['sp_state']==7) //30% { $USERUPDATESET[] = "uploaded = uploaded + $upthis"; $USERUPDATESET[] = "downloaded = downloaded + $truedownthis*3/10"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = $upthis; - $examIndexData[\App\Models\Exam::INDEX_DOWNLOADED] = $truedownthis * 3 / 10; } elseif($torrent['sp_state']==1) //Normal { $USERUPDATESET[] = "uploaded = uploaded + $upthis"; $USERUPDATESET[] = "downloaded = downloaded + $truedownthis"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = $upthis; - $examIndexData[\App\Models\Exam::INDEX_DOWNLOADED] = $truedownthis; } } } @@ -340,7 +324,6 @@ else // continue an existing session if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0) $upthis = $trueupthis * $uploaderdouble_torrent; $USERUPDATESET[] = "uploaded = uploaded + $upthis"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = $upthis; } elseif($global_promotion_state == 3) //2X { @@ -349,8 +332,6 @@ else // continue an existing session else $upthis = 2*$trueupthis; $USERUPDATESET[] = "uploaded = uploaded + $upthis"; $USERUPDATESET[] = "downloaded = downloaded + $truedownthis"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = $upthis; - $examIndexData[\App\Models\Exam::INDEX_DOWNLOADED] = $truedownthis; } elseif($global_promotion_state == 4) //2X Free { @@ -358,15 +339,12 @@ else // continue an existing session $upthis = $trueupthis * $uploaderdouble_torrent; else $upthis = 2*$trueupthis; $USERUPDATESET[] = "uploaded = uploaded + $upthis"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = $upthis; } elseif($global_promotion_state == 5){ // 50% if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0) $upthis = $trueupthis * $uploaderdouble_torrent; $USERUPDATESET[] = "uploaded = uploaded + $upthis"; $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = $upthis; - $examIndexData[\App\Models\Exam::INDEX_DOWNLOADED] = $truedownthis / 2; } elseif($global_promotion_state == 6){ //2X 50% if ($uploaderdouble_torrent > 2 && $torrent['owner'] == $userid && $uploaderdouble_torrent > 0) @@ -374,16 +352,12 @@ else // continue an existing session else $upthis = 2*$trueupthis; $USERUPDATESET[] = "uploaded = uploaded + $upthis"; $USERUPDATESET[] = "downloaded = downloaded + $truedownthis/2"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = $upthis; - $examIndexData[\App\Models\Exam::INDEX_DOWNLOADED] = $truedownthis / 2; } elseif($global_promotion_state == 7){ //30% if ($torrent['owner'] == $userid && $uploaderdouble_torrent > 0) $upthis = $trueupthis * $uploaderdouble_torrent; $USERUPDATESET[] = "uploaded = uploaded + $upthis"; $USERUPDATESET[] = "downloaded = downloaded + $truedownthis*3/10"; - $examIndexData[\App\Models\Exam::INDEX_UPLOADED] = $upthis; - $examIndexData[\App\Models\Exam::INDEX_DOWNLOADED] = $truedownthis * 3 / 10; } } } @@ -467,12 +441,5 @@ if(count($USERUPDATESET) && $userid) sql_query("UPDATE users SET " . join(",", $USERUPDATESET) . " WHERE id = ".$userid); } -$examRep = new \App\Repositories\ExamRepository(); -try { - $examRep->addProgress($userid, $torrentid, $examIndexData); -} catch (\Exception $exception) { - do_log("add exam progress fail: " . $exception->getMessage(), 'critical'); -} - benc_resp($rep_dict); ?>