Skip to content

refactor: remove unnecessary comments and improve indentation #197

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: remove unnecessary comments and improve indentation #197

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
122 changes: 7 additions & 115 deletions app/Http/Controllers/AvbookController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,107 +144,9 @@ public function index(Request $request)

public function javlib(Request $request)
{
// $where_map = ['hd' => 'have_hd',
// 'sub' => 'have_sub',
// 'file' => 'have_file',
// 'Series' => 'Series',
// 'Label' => 'Label',
// 'Studio' => 'Studio',
// 'director' => 'director','wanted' => 'wanted'
// ];
$table_key = ['movie_title','movie_pic_cover','censored_id',
'have_file','have_mg','have_sub','have_hd','owned','favorite','wanted','watched',
'Genre','code_36','release_date'];
// $title = '';
// $orderby = "magnet_date";
// $where_books = [];
// $page_info = [];
//
// foreach ($request->all() as $key => $value) {
// if(isset($where_map[$key])){
// $where_books[]=[$where_map[$key],$value];
// }
// $page_info[$key] = $value;
// }
// if($request->mg=='1'){
// $where_books[] =['have_mg','1'];
// }elseif($request->mg==='0'){
// $orderby = 'code_10';
// }
// if($request->ltitle){
// $request->ltitle = array_unique($request->ltitle);
// $title = implode('-',$request->ltitle);
// }
//// var_dump($request->owned);die;
// if($request->owned=='1'){
// $where_books[] =['owned','1'];
// $page_info['ltitle'] = array_diff($page_info['ltitle'], ["未拥有"]);
// }elseif ($request->owned === '0'){
// //var_dump($page_info['ltitle']);die;
// $page_info['ltitle'] = array_diff($page_info['ltitle'], ["已拥有"]);
// $where_books[] =['owned','0'];
// }
// if($request->favorite=='1'){
// $where_books[] =['favorite','>','0'];;
// }
//
//
// if($request->notfile){
// $where_books[] =['have_file','!=',$request->notfile];
// }
// if($request->notSeries=='_'){
// $where_books[] =['Series','!=',''];
// }
// if($request->gc){
// $request->gc = array_unique($request->gc);
// foreach ($request->gc as $genrecode) {
// $where_books[] =['Genre','like','%['.$genrecode.']%'];
// }
// }
// if($request->strgc){
// $arr_gc = explode('-',$request->strgc);
// foreach ($arr_gc as $genrecode) {
// $where_books[] =['Genre','like','%['.$genrecode.']%'];
// }
// }
//
// if($request->notgc){
// $request->notgc = array_unique($request->notgc);
// foreach ($request->notgc as $genrecode) {
// $where_books[] =['Genre','not like','%['.$genrecode.']%'];
// }
// }
// if($request->st){
// $where_books[] =['JAV_Idols','like','%['.$request->st.']%'];
// $data['res_star']=Actresses::where('code_36',$request->st)->first();;
// }
// if($request->st1){
// $where_books[] =['JAV_Idols','like','%['.$request->st1.']%'];
// $data['res_star1']=Actresses::where('code_36',$request->st)->first();;
// }
// if($request->st0){
// $where_books[] =['JAV_Idols','['.$request->st0.']'];
// }
// if($request->str_w){
// $arr_temp = explode('-',$request->str_w);
// $where_books[] =[$arr_temp[0],$arr_temp[1]];
// }
// if($request->orderby){
// $orderby = $request->orderby;
// }
// $idkeyk= [];
// if($request->search){
//
// preg_match_all('/([a-zA-Z]{2,6})[-|_|\s]{0,3}([0-9]{3,4})(.*?)/', $request->search,$out);
// foreach ($out[1] as $key => $value) {
// $idkeyk[strtoupper($out[1][$key]).'-'.$out[2][$key]]=1;//."({$out[0][$key]})"
// }
// if (empty($idkeyk)) {
// $where_books[] =['movie_title','like','%'.$request->search.'%'];
// }else{
// $idkeyk=array_keys($idkeyk);
// }
// }

if(!empty($where_books)){
$Avbooks = Avbooks::select($table_key)->where($where_books)->orderBy($orderby, 'desc')->orderBy('code_10', 'desc')->paginate(config('avbook.cen_per_page'));
Expand Down Expand Up @@ -297,12 +199,7 @@ public function javlibmovie(Request $request)
if (empty($movie_info)) {
die($censored_id ."==not find <a href = '/movie?censored_id={$data['last_censored_id']}'><=== </a> || <a href = '/movie?censored_id={$data['next_censored_id']}'>===> </a>");
}
// if($movie_info['visited']<254){
// $movie_info['visited']=$movie_info['visited'] +1;
// $t_update = ['visited'=>$movie_info['visited']];
// Avbooks::where('code_36',$movie_info['code_36'])->update($t_update);
//
// }

$find=array('[',']');
$movie_info['JAV_Idols'] = str_replace($find, '',str_replace('][', ',', $movie_info['JAV_Idols']));
$arr_star = explode(',', $movie_info['JAV_Idols']);
Expand All @@ -313,16 +210,6 @@ public function javlibmovie(Request $request)
$genre_info = DB::table('avbook_avmoo_genre')
->whereIn('genre_code', $arr_genre_code)->get();

// $avbus = Javbus::where('avmoo_code_36',$movie_info['code_36'])->orWhere('censored_id',$movie_info['censored_id'])->first();

// $res_more= [ ];
// if (!empty($avbus->Similar)) {
// $Similar= explode(',', str_replace($find, '',str_replace('][', ',',$avbus->Similar)));
// $res_more =Avbooks::whereIn('censored_id', $Similar)->get();
// }
$genre_config=['4m'=>'主观视角','8'=>'眼镜' ];
// [['class="btn-warning ',''],['4m'=>'主观视角','8'=>'眼镜','84m'=>'完全主观' ]];//自定义添加类别

$data['res_star'] = json_decode(json_encode($idols_info),true); ;//$user->toArray();
$data['res_genre'] = json_decode(json_encode($genre_info),true);
$data['genre_config'] = $genre_config;
Expand Down Expand Up @@ -364,15 +251,18 @@ public function movie(Request $request)
}else{
$movie_info= Movies::where('censored_id',$censored_id)->orderBy('code_10', 'desc')->first();
}

if (empty($movie_info)) {
die($censored_id ."==not find <a href = '/movie?censored_id={$data['last_censored_id']}'><=== </a> || <a href = '/movie?censored_id={$data['next_censored_id']}'>===> </a>");
}

if($movie_info['visited']<254){
$movie_info['visited']=$movie_info['visited'] +1;
$t_update = ['visited'=>$movie_info['visited']];
Avbooks::where('code_36',$movie_info['code_36'])->update($t_update);

}

$find=array('[',']');
$movie_info['JAV_Idols'] = str_replace($find, '',str_replace('][', ',', $movie_info['JAV_Idols']));
$arr_star = explode(',', $movie_info['JAV_Idols']);
Expand All @@ -386,12 +276,13 @@ public function movie(Request $request)
$avbus = Javbus::where('avmoo_code_36',$movie_info['code_36'])->orWhere('censored_id',$movie_info['censored_id'])->first();

$res_more= [ ];

if (!empty($avbus->Similar)) {
$Similar= explode(',', str_replace($find, '',str_replace('][', ',',$avbus->Similar)));
$res_more =Avbooks::whereIn('censored_id', $Similar)->get();
}

$genre_config=['4m'=>'主观视角','8'=>'眼镜' ];
// [['class="btn-warning ',''],['4m'=>'主观视角','8'=>'眼镜','84m'=>'完全主观' ]];//自定义添加类别

$data['res_star'] = json_decode(json_encode($idols_info),true); ;//$user->toArray();
$data['res_genre'] = json_decode(json_encode($genre_info),true);
Expand All @@ -405,6 +296,7 @@ public function movie(Request $request)
return view('layout_movie', $data);

}

public function genre(Request $request)
{
return view('layout_genre');
Expand Down