implemented nice links and fixed Code blocks with new lines are broken, when starting directly after another block

Fixes #172

Author: secure-77

Changelog.md

@@ -12,7 +12,8 @@
 - eleminated regex-based post-processing by implementing it into PerliteParsedown, this fixed issue [#177](https://github.com/secure-77/Perlite/issues/177)
 - implemented support for internal Markdown Links [#170](https://github.com/secure-77/Perlite/issues/170)
 - implemented support for parameter based obsidian image attribute syntax to fix issue [#142](https://github.com/secure-77/Perlite/issues/142)
-
+- implemented support for "nice" internal links, this way always the filename only will be displayed without the path
+- fixed issue [#172](https://github.com/secure-77/Perlite/issues/172)
 
 
 ## 1.6

docker-compose-build.yml

@@ -11,6 +11,7 @@ services:
       - ALLOWED_FILE_LINK_TYPES=pdf,mp4
       - HIGHLIGHTJS_LANGS=powershell
       - DISABLE_POP_HOVER=true
+      - NICE_LINKS=true
       - SHOW_TOC=true
       - SHOW_LOCAL_GRAPH=true
       - HOME_FILE=README

docker-compose-dev.yml

@@ -12,6 +12,7 @@ services:
       - ALLOWED_FILE_LINK_TYPES=pdf,mp4
       - HIGHLIGHTJS_LANGS=powershell
       - DISABLE_POP_HOVER=false
+      - NICE_LINKS=true
       - SHOW_TOC=true
       - SHOW_LOCAL_GRAPH=true
       - HOME_FILE=README

docker-compose.yml

@@ -12,6 +12,7 @@ services:
       - ALLOWED_FILE_LINK_TYPES=pdf,mp4
       - HIGHLIGHTJS_LANGS=powershell
       - DISABLE_POP_HOVER=false
+      - NICE_LINKS=true
       - SHOW_TOC=true
       - SHOW_LOCAL_GRAPH=true
       - HOME_FILE=README

perlite/.src/PerliteParsedown.php

@@ -860,6 +860,9 @@ protected function blockListContinue($Line, array $Block)
         }
 
         if (!isset($Block['interrupted'])) {
+            if (preg_match('/^[`~]{3,}/', $Line['text'])) {
+                return null;
+            }
             $text = preg_replace('/^[ ]{0,4}/', '', $Line['body']);
 
             $Block['li']['text'][] = $text;
@@ -1239,12 +1242,13 @@ protected function inlineInternalLink($Excerpt)
             $path = implode('/', $segments);
             $linkFile = preg_replace('#^(\.\./)+#', '', $linkFile);
 
-            // use only the file name for nice links
-            if ($this->niceLinks == true) {
-                $segments = explode('/', $linkText);
-                $segments = array_slice($segments, count($segments) - 1, 1);
-                $linkText = $segments[0];
-            }
+        }
+
+        // use only the file name for nice links
+        if ($this->niceLinks == true) {
+            $segments = explode('/', $linkText);
+            $segments = array_slice($segments, count($segments) - 1, 1);
+            $linkText = $segments[0];
         }
 
 
@@ -1343,13 +1347,9 @@ protected function inlineInternalEmbed($Excerpt)
             return;
         }
 
-
-
         $raw = $m[1];
         $parts = explode('|', $raw);
 
-
-
         $file = $parts[0];
         $mod1 = $parts[1] ?? null;
         $mod2 = $parts[2] ?? null;
@@ -1416,7 +1416,6 @@ protected function inlineInternalEmbed($Excerpt)
 
     }
 
-
     protected function buildInternalImage(string $file, array $attrs, int $extent)
     {
         $src = rtrim($this->uriPath . $this->path, '/') . '/' . $file;
@@ -1464,7 +1463,6 @@ protected function buildInternalImage(string $file, array $attrs, int $extent)
         ];
     }
 
-
     protected function buildInternalImageFromFragment(string $file, int $extent)
     {
         [$file, $fragment] = explode('#', $file, 2);
@@ -1506,7 +1504,6 @@ protected function buildInternalImageFromLegacy(string $raw, int $extent)
         return $this->buildInternalImage($file, $attrs, $extent);
     }
 
-
     protected function popupIconSvg()
     {
         return '<svg class="popup-icon" xmlns="http://www.w3.org/2000/svg" width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">

perlite/content.php

@@ -63,7 +63,8 @@ function parseContent($requestFile)
 	global $lineBreaks;
 	global $allowedFileLinkTypes;
 	global $htmlSafeMode;
-	global $relPathes;
+	global $absolutePath;
+	global $niceLinks;
 
 
 	// call menu again to refresh the array
@@ -78,15 +79,15 @@ function parseContent($requestFile)
 
 
 	// Relative or absolute pathes
-	if ($relPathes) {
+	if ($absolutePath) {
 		$path = $startDir;
 	} else {
 		$path = $startDir . $path;
 	}
 
 
 
-	$Parsedown = new PerliteParsedown($path, $uriPath,true, $allowedFileLinkTypes);
+	$Parsedown = new PerliteParsedown($path, $uriPath,$niceLinks, $allowedFileLinkTypes);
 	$Parsedown->setSafeMode($htmlSafeMode);
 	$Parsedown->setBreaksEnabled($lineBreaks);
 	$cleanFile = '';

perlite/helper.php

@@ -40,8 +40,8 @@
 	$hiddenFileAccess = empty(getenv('HIDDEN_FILE_ACCESS')) ? false : filter_var(getenv('HIDDEN_FILE_ACCESS'), FILTER_VALIDATE_BOOLEAN);
 
 // use absolut paths instead of relative paths
-if (!isset($relPathes))
-	$relPathes = empty(getenv('ABSOLUTE_PATHS')) ? false : filter_var(getenv('ABSOLUTE_PATHS'), FILTER_VALIDATE_BOOLEAN);
+if (!isset($absolutePath))
+	$absolutePath = empty(getenv('ABSOLUTE_PATHS')) ? false : filter_var(getenv('ABSOLUTE_PATHS'), FILTER_VALIDATE_BOOLEAN);
 
 // Meta Tags infos
 if (empty($siteTitle))
@@ -78,6 +78,11 @@
 if (!isset($lineBreaks))
 	$lineBreaks = empty(getenv('LINE_BREAKS')) ? true : filter_var(getenv('LINE_BREAKS'), FILTER_VALIDATE_BOOLEAN);
 
+// nice links
+if (!isset($niceLinks))
+	$niceLinks = empty(getenv('NICE_LINKS')) ? true : filter_var(getenv('NICE_LINKS'), FILTER_VALIDATE_BOOLEAN);
+
+
 // file types
 if (empty($allowedFileLinkTypes))
 	$allowedFileLinkTypes = empty(getenv('ALLOWED_FILE_LINK_TYPES')) ? ['pdf', 'mp4'] : explode(",", getenv('ALLOWED_FILE_LINK_TYPES'));

perlite/settings.php

@@ -21,17 +21,18 @@
 $showLocalGraph = "true";
 $font_size = "15";
 $hideFolders = "docs,trash";
+$niceLinks = true;
 
 
 // --- Advanced Settings ---
 $hiddenFileAccess = false;
-$relPathes = false;
+$absolutePath = false;
 $uriPath = "/";
 $htmlSafeMode = true;
 $useZettelkastenFilenames = false;
 $highlightJSLangs = ["powershell", "x86asm"];
 $allowedFileLinkTypes = ['pdf', 'mp4'];
-$tempPath = "";  // path for graph html, leave empty for automatic
+$tempPath = "";  // path to store the pre-rendered graph relations, leave empty for /tmp
 
 
 // --- Metadata Settings ---