Merge pull request #17 from mauricerenck/develop

Fixes
mauricerenck · May 4, 2019 · 62a0c2f · 62a0c2f
2 parents d14b423 + ff05fdb
commit 62a0c2f
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 47 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@
 /vendor/symfony
 /vendor/theseer
 /vendor/webmozart
+/.history
diff --git a/composer.json b/composer.json
@@ -9,7 +9,7 @@
             "email": "[email protected]"
         }
     ],
-    "version": "1.0.3",
+    "version": "1.0.4",
     "autoload": {
         "files": [
             "utils/PodcasterUtils.php",

diff --git a/composer.lock b/composer.lock
diff --git a/index.php b/index.php
@@ -61,6 +61,7 @@
             'pattern' => '(:all)/' . option('mauricerenck.podcaster.defaultFeed', 'feed'),
             'action' => function ($slug) {
                 $podcasterUtils = new PodcasterUtils();
+
                 $page = $podcasterUtils->getPageFromSlug($slug. '/' . option('mauricerenck.podcaster.defaultFeed', 'feed'));
 
                 if(option('mauricerenck.podcaster.statsInternal') === true) {
@@ -102,7 +103,7 @@
                 $episode = $podcasterUtils->getPageFromSlug($slug);
                 $podcasterUtils->setCurrentEpisode($episode);
 
-                $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/routes.php b/routes.php
diff --git 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
@@ -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) {

diff --git a/utils/PodcasterStatsMysql.php b/utils/PodcasterStatsMysql.php
@@ -105,7 +105,8 @@ public function increaseDownloads($episode, string $trackingDate) {
         $downloadDate = $this->formatTrackingDate($trackingDate);
         $episodeStats = $this->getEpisodeStats($episode->uid(), $downloadDate);
 
-        $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;
@@ -161,4 +162,4 @@ private function formatTrackingDate($timestamp): string {
         return date('Y-m-d', $timestamp);
     }
 
-}
+}