From 6edd9875f2ed31756a51f12d324e642683db9f85 Mon Sep 17 00:00:00 2001
From: Maurice Renck <work@maurice-renck.de>
Date: Sat, 4 May 2019 16:52:25 +0200
Subject: [PATCH 1/5] fixed: podlove player

---
 index.php                   | 2 ++
 snippets/podlove-player.php | 4 ++--
 utils/PodcasterStats.php    | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/index.php b/index.php
index 23c4232..f3d7dd4 100644
--- a/index.php
+++ b/index.php
@@ -61,6 +61,7 @@
             'pattern' => '(:all)/' . option('mauricerenck.podcaster.defaultFeed', 'feed'),
             'action' => function ($slug) {
                 $podcasterUtils = new PodcasterUtils();
+                // !!! Von hier holen
                 $page = $podcasterUtils->getPageFromSlug($slug. '/' . option('mauricerenck.podcaster.defaultFeed', 'feed'));
 
                 if(option('mauricerenck.podcaster.statsInternal') === true) {
@@ -102,6 +103,7 @@
                 $episode = $podcasterUtils->getPageFromSlug($slug);
                 $podcasterUtils->setCurrentEpisode($episode);
 
+                // !!! FIXME
                 $podcast = $episode->siblings()->find('feed');
 
                 if(option('mauricerenck.podcaster.statsInternal') === true) {
diff --git a/snippets/podlove-player.php b/snippets/podlove-player.php
index d750715..69f2dda 100644
--- a/snippets/podlove-player.php
+++ b/snippets/podlove-player.php
@@ -16,11 +16,11 @@
 
     $audioFile = $podcasterUtils->getPodcastFile();
 ?>
-<div id="podlovePlayer"></div>
+<div id="podlovePlayerContainer"></div>
 <script src="//cdn.podlove.org/web-player/embed.js"></script>
 
 <script>
-    podlovePlayer('#podlovePlayer', {
+    podlovePlayer('#podlovePlayerContainer', {
         <?php if($podcast->podcasterPodloveMainColor()->isNotEmpty() && $podcast->podcasterPodloveHighlighColor()->isNotEmpty()) : ?>
         theme: {
             main: '#<?php echo str_replace('#', '', $podcast->podcasterPodloveMainColor()); ?>',
diff --git a/utils/PodcasterStats.php b/utils/PodcasterStats.php
index fa63d0d..25bca5b 100644
--- a/utils/PodcasterStats.php
+++ b/utils/PodcasterStats.php
@@ -17,10 +17,11 @@ public function increaseDownloads($page, int $trackingDate): void {
 			$stats = new PodcasterStatsMySql();
 		}
 
+		$stats->increaseDownloads($page, $trackingDate);
+
 		$podTrack = new PodcasterStatsPodTrac();
 		$podTrack->increaseDownloads($page);
 
-		$stats->increaseDownloads($page, $trackingDate);
 	}
 
 	public function increaseFeedVisits($page, int $trackingDate) {

From 69c4949ba4a3dfde8e17d95ce678c86a65217bac Mon Sep 17 00:00:00 2001
From: Maurice Renck <work@maurice-renck.de>
Date: Sat, 4 May 2019 16:52:34 +0200
Subject: [PATCH 2/5] chore: clode cleanup

---
 routes.php | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 routes.php

diff --git a/routes.php b/routes.php
deleted file mode 100644
index f09d892..0000000
--- a/routes.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-return [
-    [
-      'pattern' => '(:all)/download/(:any)',
-      'action'  => function ($slug, $filename) {
-        $episode = page($slug);
-            $filename = str_replace('.mp3', '', $filename);
-            return  $episode->audio($episode->podcasterMp3())->first();
-            return $file;
-      }
-    ]
-];
\ No newline at end of file

From c50079b0b76c80fd23a17711924965a2841fef18 Mon Sep 17 00:00:00 2001
From: Maurice Renck <work@maurice-renck.de>
Date: Sat, 4 May 2019 16:52:47 +0200
Subject: [PATCH 3/5] chore: maintanance

---
 .gitignore    |  1 +
 composer.json |  2 +-
 composer.lock | 56 +++++++++++++++++++++++++--------------------------
 3 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5ea8192..4704c76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /vendor/symfony
 /vendor/theseer
 /vendor/webmozart
+/.history
diff --git a/composer.json b/composer.json
index 2e6079b..b762e6f 100644
--- a/composer.json
+++ b/composer.json
@@ -9,7 +9,7 @@
             "email": "hello@maurice-renck.de"
         }
     ],
-    "version": "1.0.3",
+    "version": "1.0.4",
     "autoload": {
         "files": [
             "utils/PodcasterUtils.php",
diff --git a/composer.lock b/composer.lock
index 522bbf8..9e3236b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "540eb57fda794557a7049f7a3acff953",
+    "content-hash": "aa9e514e6e4f8f10973c19f0ce0e5812",
     "packages": [
         {
             "name": "getkirby/composer-installer",
@@ -142,16 +142,16 @@
         },
         {
             "name": "myclabs/deep-copy",
-            "version": "1.8.1",
+            "version": "1.9.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8"
+                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
-                "reference": "3e01bdad3e18354c3dce54466b7fbe33a9f9f7f8",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
+                "reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
                 "shasum": ""
             },
             "require": {
@@ -186,7 +186,7 @@
                 "object",
                 "object graph"
             ],
-            "time": "2018-06-11T23:09:50+00:00"
+            "time": "2019-04-07T13:18:21+00:00"
         },
         {
             "name": "phar-io/manifest",
@@ -346,16 +346,16 @@
         },
         {
             "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.0",
+            "version": "4.3.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
+                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
+                "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c",
                 "shasum": ""
             },
             "require": {
@@ -393,7 +393,7 @@
                 }
             ],
             "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-30T07:14:17+00:00"
+            "time": "2019-04-30T17:48:53+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
@@ -759,16 +759,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.8",
+            "version": "7.5.9",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "c29c0525cf4572c11efe1db49a8b8aee9dfac58a"
+                "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c29c0525cf4572c11efe1db49a8b8aee9dfac58a",
-                "reference": "c29c0525cf4572c11efe1db49a8b8aee9dfac58a",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/134669cf0eeac3f79bc7f0c793efbc158bffc160",
+                "reference": "134669cf0eeac3f79bc7f0c793efbc158bffc160",
                 "shasum": ""
             },
             "require": {
@@ -839,7 +839,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-03-26T13:23:54+00:00"
+            "time": "2019-04-19T15:50:46+00:00"
         },
         {
             "name": "sebastian/code-unit-reverse-lookup",
@@ -1008,16 +1008,16 @@
         },
         {
             "name": "sebastian/environment",
-            "version": "4.1.0",
+            "version": "4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656"
+                "reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/6fda8ce1974b62b14935adc02a9ed38252eca656",
-                "reference": "6fda8ce1974b62b14935adc02a9ed38252eca656",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/3095910f0f0fb155ac4021fc51a4a7a39ac04e8a",
+                "reference": "3095910f0f0fb155ac4021fc51a4a7a39ac04e8a",
                 "shasum": ""
             },
             "require": {
@@ -1032,7 +1032,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "4.1-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -1057,7 +1057,7 @@
                 "environment",
                 "hhvm"
             ],
-            "time": "2019-02-01T05:27:49+00:00"
+            "time": "2019-04-25T07:55:20+00:00"
         },
         {
             "name": "sebastian/exporter",
@@ -1452,7 +1452,7 @@
                 },
                 {
                     "name": "Gert de Pagter",
-                    "email": "backendtea@gmail.com"
+                    "email": "BackEndTea@gmail.com"
                 }
             ],
             "description": "Symfony polyfill for ctype functions",
@@ -1467,16 +1467,16 @@
         },
         {
             "name": "theseer/tokenizer",
-            "version": "1.1.0",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
+                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8",
+                "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8",
                 "shasum": ""
             },
             "require": {
@@ -1503,7 +1503,7 @@
                 }
             ],
             "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07T12:08:54+00:00"
+            "time": "2019-04-04T09:56:43+00:00"
         },
         {
             "name": "webmozart/assert",

From 554165b72e574def241780b80a4991ec53029017 Mon Sep 17 00:00:00 2001
From: Maurice Renck <work@maurice-renck.de>
Date: Sat, 4 May 2019 16:53:20 +0200
Subject: [PATCH 4/5] chore: maintanance

---
 utils/PodcasterStatsMysql.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/PodcasterStatsMysql.php b/utils/PodcasterStatsMysql.php
index 21802bc..7326617 100644
--- a/utils/PodcasterStatsMysql.php
+++ b/utils/PodcasterStatsMysql.php
@@ -105,6 +105,7 @@ public function increaseDownloads($episode, string $trackingDate) {
         $downloadDate = $this->formatTrackingDate($trackingDate);
         $episodeStats = $this->getEpisodeStats($episode->uid(), $downloadDate);
 
+        // !!! FIXME
         $podcast = str::slug($episode->siblings()->find('feed')->podcasterTitle());
         if(!$episodeStats) {
             $this->setDownloads($podcast, $episode->uid(), $downloadDate);

From ff05fdbeca787a242b0abab322a59b5539170682 Mon Sep 17 00:00:00 2001
From: Maurice Renck <work@maurice-renck.de>
Date: Sat, 4 May 2019 17:16:55 +0200
Subject: [PATCH 5/5] fixed: feed detection

---
 index.php                     | 5 ++---
 utils/PodcasterStatsMysql.php | 6 +++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/index.php b/index.php
index f3d7dd4..ebcf5f1 100644
--- a/index.php
+++ b/index.php
@@ -61,7 +61,7 @@
             'pattern' => '(:all)/' . option('mauricerenck.podcaster.defaultFeed', 'feed'),
             'action' => function ($slug) {
                 $podcasterUtils = new PodcasterUtils();
-                // !!! Von hier holen
+
                 $page = $podcasterUtils->getPageFromSlug($slug. '/' . option('mauricerenck.podcaster.defaultFeed', 'feed'));
 
                 if(option('mauricerenck.podcaster.statsInternal') === true) {
@@ -103,8 +103,7 @@
                 $episode = $podcasterUtils->getPageFromSlug($slug);
                 $podcasterUtils->setCurrentEpisode($episode);
 
-                // !!! FIXME
-                $podcast = $episode->siblings()->find('feed');
+                $podcast = $episode->siblings()->find(option('mauricerenck.podcaster.defaultFeed', 'feed'));
 
                 if(option('mauricerenck.podcaster.statsInternal') === true) {
                     $stats = new PodcasterStats();
diff --git a/utils/PodcasterStatsMysql.php b/utils/PodcasterStatsMysql.php
index 7326617..65b945c 100644
--- a/utils/PodcasterStatsMysql.php
+++ b/utils/PodcasterStatsMysql.php
@@ -105,8 +105,8 @@ public function increaseDownloads($episode, string $trackingDate) {
         $downloadDate = $this->formatTrackingDate($trackingDate);
         $episodeStats = $this->getEpisodeStats($episode->uid(), $downloadDate);
 
-        // !!! FIXME
-        $podcast = str::slug($episode->siblings()->find('feed')->podcasterTitle());
+        $podcast = str::slug($episode->siblings()->find(option('mauricerenck.podcaster.defaultFeed', 'feed'))->podcasterTitle());
+
         if(!$episodeStats) {
             $this->setDownloads($podcast, $episode->uid(), $downloadDate);
             return true;
@@ -162,4 +162,4 @@ private function formatTrackingDate($timestamp): string {
         return date('Y-m-d', $timestamp);
     }
 
-}
+}
\ No newline at end of file