Merge pull request #31 from Kovah/dev

v0.0.6

Author: Kovah

.env.docker

@@ -32,8 +32,8 @@ DB_USERNAME=linkace
 DB_PASSWORD=changeThisPassword
 
 ## Configure user session details
-# Set the time after a session expires automatically, in minutes
-SESSION_LIFETIME=120
+# Set the time after a session expires automatically, in minutes. Default is 7 days.
+SESSION_LIFETIME=10080
 
 ## Mail configuration
 MAIL_DRIVER=smtp

.env.example

@@ -32,8 +32,8 @@ DB_USERNAME=linkace
 DB_PASSWORD=changeThisPassword
 
 ## Configure user session details
-# Set the time after a session expires automatically, in minutes
-SESSION_LIFETIME=120
+# Set the time after a session expires automatically, in minutes. Default is 7 days.
+SESSION_LIFETIME=10080
 
 ## Mail configuration
 MAIL_DRIVER=smtp

app/Helper/LinkAce.php

@@ -10,36 +10,57 @@
 class LinkAce
 {
     /**
-     * Get the title of an HTML page b
+     * Get the title and description of a website form it's URL
      *
      * @param string $url
      * @return string|string[]
      */
-    public static function getTitleFromURL(string $url)
+    public static function getMetaFromURL(string $url)
     {
-        $fail_return = parse_url($url, PHP_URL_HOST);
+        $title_fallback = parse_url($url, PHP_URL_HOST);
 
+        $fallback = [
+            'title' => $title_fallback,
+            'description' => null,
+        ];
+
+        // Try to get the HTML content of that URL
         try {
-            $fp = file_get_contents($url);
+            $html = file_get_contents($url);
         } catch (\Exception $e) {
-            return $fail_return;
+            return $fallback;
         }
 
-        if (!$fp) {
-            return $fail_return;
+        if (!$html) {
+            return $fallback;
         }
 
-        $res = preg_match("/<title>(.*)<\/title>/siU", $fp, $title_matches);
+        // Parse the HTML for the title
+        $res = preg_match("/<title>(.*)<\/title>/siU", $html, $title_matches);
 
-        if (!$res) {
-            return $fail_return;
+        if ($res) {
+            // Clean up title: remove EOL's and excessive whitespace.
+            $title = preg_replace('/\s+/', ' ', $title_matches[1]);
+            $title = trim($title);
         }
 
-        // Clean up title: remove EOL's and excessive whitespace.
-        $title = preg_replace('/\s+/', ' ', $title_matches[1]);
-        $title = trim($title);
+        // Parse the HTML for the meta description, or alternatively for the og:description property
+        $res = preg_match(
+            '/<meta (?:property="og:description"|name="description") content="(.*?)"(?:\s\/)?>/i',
+            $html,
+            $description_matches
+        );
+
+        if ($res) {
+            // Clean up description: remove EOL's and excessive whitespace.
+            $description = preg_replace('/\s+/', ' ', $description_matches[1]);
+            $description = trim($description);
+        }
 
-        return $title;
+        return [
+            'title' => $title ?? $title_fallback,
+            'description' => $description ?? null,
+        ];
     }
 
     /**

app/Http/Controllers/App/ExportController.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Http\Controllers\App;
+
+use App\Http\Controllers\Controller;
+use App\Models\Link;
+use Illuminate\Http\Request;
+
+class ExportController extends Controller
+{
+    /**
+     * Show the application dashboard.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function getExport()
+    {
+        return view('actions.export.export');
+    }
+
+    /**
+     * Permanently delete entries for a model from the trash
+     *
+     * @param Request $request
+     * @return \Illuminate\Http\Response
+     */
+    public function doExport(Request $request)
+    {
+        $links = Link::orderBy('title', 'asc')->get();
+
+        $file_content = view()->make('actions.export.exportfile', ['links' => $links])->render();
+        $file_name = config('app.name') . '_export.html';
+
+        return response()->streamDownload(function () use ($file_content) {
+            echo $file_content;
+        }, $file_name);
+    }
+}

app/Http/Controllers/App/ImportController.php

@@ -52,14 +52,16 @@ public function doImport(DoImportRequest $request)
                 $skipped++;
             } else {
 
-                $title = $link['title'] ?: LinkAce::getTitleFromURL($link['uri']);
+                $link_meta = LinkAce::getMetaFromURL($link['uri']);
+
+                $title = $link['title'] ?: $link_meta['title'];
 
                 $new_link = Link::create([
                     'user_id' => $user_id,
                     'category_id' => null,
                     'url' => $link['uri'],
                     'title' => $title,
-                    'description' => $link['note'],
+                    'description' => $link['note'] ?: $link_meta['description'],
                     'icon' => LinkIconMapper::mapLink($link['uri']),
                     'is_private' => $link['pub'],
                     'created_at' => Carbon::createFromTimestamp($link['time']),

app/Http/Controllers/Models/LinkController.php

@@ -66,14 +66,17 @@ public function store(LinkStoreRequest $request)
         // Save the new link
         $data = $request->except(['tags', 'reload_view']);
 
-        // Try to get the <title> of the URL if no title was provided
-        $data['title'] = $data['title'] ?? LinkAce::getTitleFromURL($data['url']);
+        // Try to get the meta information of the URL if no title / description was provided
+        $link_meta = LinkAce::getMetaFromURL($data['url']);
+
+        $data['title'] = $data['title'] ?: $link_meta['title'];
+        $data['description'] = $data['description'] ?: $link_meta['description'];
 
         // Set the user ID
         $data['user_id'] = auth()->user()->id;
         $data['icon'] = LinkIconMapper::mapLink($data['url']);
 
-        $data['category_id'] = isset($data['category_id']) && $data['category_id'] > 0 ?: null;
+        $data['category_id'] = isset($data['category_id']) && $data['category_id'] > 0 ? $data['category_id'] : null;
 
         // Create the new link
         $link = Link::create($data);

composer.json

@@ -3,7 +3,7 @@
   "description": "A small, selfhosted bookmark manager with advanced features, built with Laravel and Docker",
   "license": "MIT",
   "type": "project",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "require": {
     "php": "^7.1.3",
     "doctrine/dbal": "^2.8",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkace",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "A small, selfhosted bookmark manager with advanced features, built with Laravel and Docker",
   "homepage": "https://github.com/Kovah/LinkAce",
   "repository": {

resources/assets/sass/third-party/bootstrap/_variables.scss

@@ -389,8 +389,8 @@ $input-btn-padding-x: .75rem !default;
 $input-btn-font-size: $font-size-base !default;
 $input-btn-line-height: $line-height-base !default;
 
-$input-btn-focus-width: .2rem !default;
-$input-btn-focus-color: rgba($component-active-bg, .25) !default;
+$input-btn-focus-width: .15rem !default;
+$input-btn-focus-color: rgba($component-active-bg, .15) !default;
 $input-btn-focus-box-shadow: 0 0 0 $input-btn-focus-width $input-btn-focus-color !default;
 
 $input-btn-padding-y-xs: .15rem !default;

resources/lang/en/export.php

@@ -0,0 +1,7 @@
+<?php
+return [
+    'export' => 'Export',
+    'start_export' => 'Start Export',
+
+    'export_help' => 'Running the export will save all existing bookmarks into a regular bookmarks-compatible file.',
+];