Merge pull request #3648 from HDInnovations/Request-3647

(Add) Request #3647

Author: HDVinnie

app/Http/Controllers/User/TorrentZipController.php

@@ -34,6 +34,24 @@ public function show(Request $request, User $user): \Illuminate\Http\RedirectRes
         // Authorized User
         abort_unless($request->user()->is($user), 403);
 
+        // Get Users History Or Peers
+        if ($request->boolean('type') === true) {
+            $torrents = Torrent::whereRelation('peers', 'user_id', '=', $user->id)
+                ->whereRelation('peers', 'active', '=', true)
+                ->whereRelation('peers', 'visible', '=', true)
+                ->get();
+
+            $zipFileName = $user->username.'-peers'.'.zip';
+        } else {
+            $torrents = Torrent::whereRelation('history', 'user_id', '=', $user->id)->get();
+
+            $zipFileName = $user->username.'-history'.'.zip';
+        }
+
+        if ($torrents->isEmpty()) {
+            return redirect()->back()->withErrors('No Torrents Found');
+        }
+
         // Define Dir For Zip
         $zipPath = getcwd().'/files/tmp_zip/';
 
@@ -42,19 +60,13 @@ public function show(Request $request, User $user): \Illuminate\Http\RedirectRes
             File::makeDirectory($zipPath, 0755, true, true);
         }
 
-        // Zip File Name
-        $zipFileName = $user->username.'.zip';
-
         // Create ZipArchive Obj
         $zipArchive = new ZipArchive();
 
-        // Get Users History
-        $historyTorrents = Torrent::whereRelation('history', 'user_id', '=', $user->id)->get();
-
         if ($zipArchive->open($zipPath.$zipFileName, ZipArchive::CREATE | ZipArchive::OVERWRITE) === true) {
             $announceUrl = route('announce', ['passkey' => $user->passkey]);
 
-            foreach ($historyTorrents as $torrent) {
+            foreach ($torrents as $torrent) {
                 if (file_exists(getcwd().'/files/torrents/'.$torrent->file_name)) {
                     $dict = Bencode::bdecode(file_get_contents(getcwd().'/files/torrents/'.$torrent->file_name));
 

resources/views/user/buttons/user.blade.php

@@ -256,13 +256,56 @@ class="nav-tab__link"
                         {{ __('staff.flush-ghost-peers') }}
                     </button>
                 </form>
-                <li class="nav-tabV2">
-                    <a
-                        class="nav-tab__link"
-                        href="{{ route('users.torrent_zip.show', ['user' => $user]) }}"
-                    >
-                        {{ __('torrent.download-all') }}
-                    </a>
+                <li class="nav-tabV2" x-data="dialog">
+                    <a class="nav-tab__link" x-bind="showDialog">Download Torrent Files</a>
+
+                    <dialog class="dialog" x-bind="dialogElement">
+                        <h3 class="dialog__heading">Download Torrent Files</h3>
+                        <form
+                            class="dialog__form"
+                            action="{{ route('users.torrent_zip.show', ['user' => $user]) }}"
+                            x-bind="dialogForm"
+                        >
+                            <fieldset>
+                                <legend>Select download type:</legend>
+
+                                <div>
+                                    <input
+                                        class="form__radio"
+                                        type="radio"
+                                        id="history"
+                                        name="type"
+                                        value="false"
+                                        checked
+                                    />
+                                    <label for="history">All History</label>
+                                </div>
+
+                                <div>
+                                    <input
+                                        class="form__radio"
+                                        type="radio"
+                                        id="peer"
+                                        name="type"
+                                        value="true"
+                                    />
+                                    <label for="peer">Active Peers</label>
+                                </div>
+                            </fieldset>
+                            <p class="form__group">
+                                <button class="form__button form__button--filled">
+                                    {{ __('common.download') }}
+                                </button>
+                                <button
+                                    formmethod="dialog"
+                                    formnovalidate
+                                    class="form__button form__button--outlined"
+                                >
+                                    {{ __('common.cancel') }}
+                                </button>
+                            </p>
+                        </form>
+                    </dialog>
                 </li>
             @endif
         </ul>