feature/fixes

.gitignore

@@ -1,2 +1 @@
-/vendor/
-/.idea/
+/vendor/

download.php

@@ -0,0 +1,12 @@
+#!/usr/bin/env php
+<?php
+// http://symfony.com/doc/current/components/console/introduction.html
+
+require __DIR__.'/vendor/autoload.php';
+
+use Zippo\Console\Command\DownloadP1SommarVinter;
+use Symfony\Component\Console\Application;
+
+$application = new Application();
+$application->add(new DownloadP1SommarVinter());
+$application->run();

downloadP3Popular.sh

@@ -187,6 +187,8 @@ do
             break 2
         else
             echo "$LENGTH failed."
+	    #sleep random 1-10 sec
+ 	    sleep $[ ( $RANDOM % 4 )  + 1 ]s
         fi
     done
 done

src/Zippo/Console/Command/DownloadP1SommarVinter.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Zippo\Console\Command;
+
+use DateTime;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Zippo\podcastFeed\Cache;
+use Zippo\podcastFeed\Model;
+
+class DownloadP1SommarVinter extends Command
+{
+    protected function configure()
+    {
+        $this
+            ->setName('download:p1sommar')
+            ->setDescription('ladda ner p1sommar')
+            ->addArgument('date', InputArgument::OPTIONAL)
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $date = $input->getArgument('date');
+        if ($date) {
+            $dateTime = new DateTime($date);
+        } else {
+            $dateTime = new DateTime('today');
+        }
+
+        $cache = new Cache();
+        $data = $cache->getP1Cache();
+        if (count($data) == 0) {
+            $url = 'http://sverigesradio.se/sida/avsnitt?programid=2071';
+            #$url = 'http://sverigesradio.se/sida/ajax/getplayerinfo?url=http%3A%2F%2Fsverigesradio.se%2Fsida%2Favsnitt%2F562300%3Fprogramid%3D2071%26playepisode%3D562300';
+            $str = Model::getStringForUrl($url);
+            $data = explode("\n", $str);
+            $cache->writeToCache($data);
+        } else {
+            $output->writeln('found cache');
+        }
+        //http://lyssnaigen.sr.se/isidor/ereg/webb_rh_sthlm/2015/06/47_sommar_i_p1_med_david_bat_34b3756_a192.m4a
+        $pattern = "/^47_sommar_i_p1(.*)\.a96$/";
+        $nameList = preg_grep($pattern, $data);
+
+        $output->writeln(var_export($data));
+    }
+}

src/Zippo/podcastFeed/Model.php

@@ -2,6 +2,8 @@
 
 namespace Zippo\podcastFeed;
 
+use SimpleXMLElement;
+
 class Model
 {
 
@@ -155,23 +157,49 @@ private function getShowFromFileMeta(FileMeta $fileMeta)
     }
 
     /**
-     * @return \SimpleXMLElement
+     * @return SimpleXMLElement
      */
     private static function getXmlForSommar()
     {
+        /*
+         * old url (redirect to below?)
+        // http://api.sr.se/api/rssfeed/rssfeed.aspx?lyssnaigenfeed=2071
+        // broadcast. original byut short desc
+        // http://sverigesradio.se/api/rss/broadcast/2071
+         */
         // pod sommar more desc
         $url = 'http://api.sr.se/api/rss/pod/4023';
+        return self::getXmlForUrl($url);
+    }
+
+    /**
+     * @param string $url
+     * @return SimpleXMLElement
+     */
+    public static function getXmlForUrl($url)
+    {
+        $str = self::getStringForUrl($url);
+        $xml = new SimpleXMLElement($str);
+        return $xml;
+    }
+
+    /**
+     * @param string $url
+     * @return string
+     */
+    public static function getStringForUrl($url)
+    {
         $curl = curl_init();
         curl_setopt($curl, CURLOPT_URL, $url);
         curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
         curl_setopt($curl, CURLOPT_AUTOREFERER, 1);
         curl_setopt($curl, CURLOPT_FOLLOWLOCATION, 1);
         $str = curl_exec($curl);
         curl_close($curl);
-        $xml = new \SimpleXMLElement($str);
-        return $xml;
+        return $str;
     }
 
+
     public static function getInfoP1Sommar()
     {
         $cache = new Cache();