revert attempt to use episode slug for audio file URL

#1214
podlove · Apr 21, 2021 · 36bd634 · 36bd634
1 parent 2e9daf4
commit 36bd634
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 31 deletions.
diff --git a/lib/ajax/file_controller.php b/lib/ajax/file_controller.php
@@ -57,7 +57,7 @@ public static function create()
         $episode_asset_id = (int) $_REQUEST['episode_asset_id'];
 
         if (!$episode_id || !$episode_asset_id) {
-            exit();
+            die();
         }
 
         if (isset($_REQUEST['slug'])) {
@@ -75,6 +75,8 @@ public static function create()
 
     private static function simulate_temporary_episode_slug($slug)
     {
-        add_filter('podlove_file_url_template', $slug);
+        add_filter('podlove_file_url_template', function ($template) use ($slug) {
+            return str_replace('%episode_slug%', \Podlove\prepare_episode_slug_for_url($slug), $template);
+        });
     }
 }
diff --git a/lib/helper.php b/lib/helper.php
@@ -317,11 +317,6 @@ function prepare_episode_slug_for_url($slug)
     return str_replace('%2F', '/', $slug);
 }
 
-// Test to if entry for slug is a absolute url path
-function is_absolute_url($slug) {
-    return strpos($slug, '://') !== false;
-}
-
 function with_blog_scope($blog_id, $callback)
 {
     $result = null;

diff --git a/lib/model/media_file.php b/lib/model/media_file.php
@@ -143,7 +143,6 @@ public function get_public_file_url($source, $context = null)
                     );
 
                     break;
-
                 case 'ptm_analytics':
                     // we track, so we need to generate a shadow URL
                     if (get_option('permalink_structure')) {
@@ -156,7 +155,6 @@ public function get_public_file_url($source, $context = null)
                     $url = home_url($path);
 
                     break;
-
                 default:
                     // tracking is off, return raw URL
                     $url = $this->get_file_url();
@@ -225,20 +223,12 @@ public function get_file_url()
                 return '';
             }
 
-            $slug = apply_filters('podlove_file_url_template', '');
-            if ($slug === '') {
-                $slug = $episode->slug;
-            }
-
-            if (\Podlove\is_absolute_url($slug)) {
-                $template = $slug;
-            } else {
-                $template = $podcast->get_url_template();
-                $template = str_replace('%media_file_base_url%', trailingslashit($podcast->media_file_base_uri), $template);
-                $template = str_replace('%episode_slug%', \Podlove\prepare_episode_slug_for_url($slug), $template);
-                $template = str_replace('%suffix%', $episode_asset->suffix, $template);
-                $template = str_replace('%format_extension%', $file_type->extension, $template);
-            }
+            $template = $podcast->get_url_template();
+            $template = apply_filters('podlove_file_url_template', $template);
+            $template = str_replace('%media_file_base_url%', trailingslashit($podcast->media_file_base_uri), $template);
+            $template = str_replace('%episode_slug%', \Podlove\prepare_episode_slug_for_url($episode->slug), $template);
+            $template = str_replace('%suffix%', $episode_asset->suffix, $template);
+            $template = str_replace('%format_extension%', $file_type->extension, $template);
 
             return trim($template);
         });
@@ -258,13 +248,9 @@ public function episode()
      */
     public function get_download_file_name()
     {
-        $slug = $this->episode()->slug;
-
-        if (\Podlove\is_absolute_url($slug)) {
-            $file_name = ltrim(parse_url($slug)['path'], '/');
-        } else {
-            $file_name = $slug.'.'.$this->episode_asset()->file_type()->extension;
-        }
+        $file_name = $this->episode()->slug
+                   .'.'
+                   .$this->episode_asset()->file_type()->extension;
 
         return apply_filters('podlove_download_file_name', $file_name, $this);
     }

diff --git a/readme.txt b/readme.txt
@@ -109,7 +109,6 @@ This product includes GeoLite2 data created by MaxMind, available from http://ww
 = 2021-04-18 =
 
 * perf: remove frontend.js (inline logic to download button HTML)
-* feat: episode slug field may contain an absolute URL ([#1211](https://github.com/podlove/podlove-publisher/pull/1211))
 
 ----
-Original file line number
+Diff line change
@@ Expand Up @@
     = 2021-04-18 =
     * perf: remove frontend.js (inline logic to download button HTML)
-    * feat: episode slug field may contain an absolute URL ([#1211](https://github.com/podlove/podlove-publisher/pull/1211))
     ----
@@ Expand Down @@