Merge branch 'master' of dev.sourcefabric.org:airtime

application/controllers/ApiController.php

@@ -236,10 +236,6 @@ class ApiController extends Zend_Controller_Action
     {
         global $CC_CONFIG;
 
-        // disable the view and the layout
-        $this->view->layout()->disableLayout();
-        $this->_helper->viewRenderer->setNoRender(true);
-
         $api_key = $this->_getParam('api_key');
         if (!in_array($api_key, $CC_CONFIG["apiKey"]))
         {
@@ -251,16 +247,19 @@ class ApiController extends Zend_Controller_Action
         $upload_dir = ini_get("upload_tmp_dir");
         $file = StoredFile::uploadFile($upload_dir);
 
-        if(Application_Model_Preference::GetDoSoundCloudUpload())
-        {
-            $soundcloud = new ATSoundcloud();
-            $soundcloud->uploadTrack($file->getRealFilePath(), $file->getName());
-        }
-
         $show_instance  = $this->_getParam('show_instance');
 
-        $show = new ShowInstance($show_instance);
+        $show_inst = new ShowInstance($show_instance);
-        $show->setRecordedFile($file->getId());
+        $show_inst->setRecordedFile($file->getId());
+
+        if(Application_Model_Preference::GetDoSoundCloudUpload())
+        {
+            $show = new Show($show_inst->getShowId());
+            $description = $show->getDescription();
+
+            $soundcloud = new ATSoundcloud();
+            $soundcloud->uploadTrack($file->getRealFilePath(), $file->getName(), $description);
+        }
 
         $this->view->id = $file->getId(); 
     }

application/models/Soundcloud.php

@@ -28,14 +28,18 @@ class ATSoundcloud {
         return $token;
     }
 
-    public function uploadTrack($filepath, $filename) 
+    public function uploadTrack($filepath, $filename, $description, $tags=array()) 
     {
         if($this->getToken())
         {
+            $tags = join(" ", $tags);
+
             $track_data = array(
                 'track[sharing]' => 'private',
                 'track[title]' => $filename,
-                'track[asset_data]' => '@' . $filepath
+                'track[asset_data]' => '@' . $filepath,
+                'track[tag_list]' => $tags,
+                'track[description]' => $description
             );
 
             try {
@@ -46,7 +50,6 @@ class ATSoundcloud {
             } 
             catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
                 echo $e->getMessage();
-                echo var_dump($track_data);
             }
         }
     }

python_apps/api_clients/api_client.py

@@ -291,9 +291,9 @@ class AirTimeApiClient(ApiClientInterface):
         response = ''
         try:
             url = self.config["base_url"] + self.config["api_base"] + self.config["show_schedule_url"]
-            #logger.debug(url)
-            url = url.replace("%%api_key%%", self.config["api_key"])
             logger.debug(url)
+            url = url.replace("%%api_key%%", self.config["api_key"])
+           
             response = urllib.urlopen(url)
             response = json.loads(response.read())
             logger.info("shows %s", response)
@@ -308,9 +308,8 @@ class AirTimeApiClient(ApiClientInterface):
         response = ''
         try:
             url = self.config["base_url"] + self.config["api_base"] + self.config["upload_file_url"]
-            #logger.debug(url)
-            url = url.replace("%%api_key%%", self.config["api_key"])
             logger.debug(url)
+            url = url.replace("%%api_key%%", self.config["api_key"])
 
             request = urllib2.Request(url, data, headers)
             response = urllib2.urlopen(request).read().strip()

python_apps/show-recorder/testrecordscript.py

@@ -109,14 +109,14 @@ class Record():
             show_end = getDateTimeObj(show[u'ends'])
             time_delta = show_end - show_starts
             
-            self.shows_to_record[show[u'starts']] = [time_delta, show[u'instance_id']]
+            self.shows_to_record[show[u'starts']] = [time_delta, show[u'instance_id'], show[u'name']]
 
 
     def check_record(self):
         
         tnow = datetime.datetime.now()
         sorted_show_keys = sorted(self.shows_to_record.keys())
-        print sorted_show_keys
+      
         start_time = sorted_show_keys[0]
         next_show = getDateTimeObj(start_time)
 
@@ -132,7 +132,10 @@ class Record():
            
             show_length = self.shows_to_record[start_time][0]
             show_instance = self.shows_to_record[start_time][1]
-            show = ShowRecorder(show_instance, show_length.seconds, start_time, filetype="mp3")
+            show_name = self.shows_to_record[start_time][2]
+            filename = show_name+"-"+start_time
+
+            show = ShowRecorder(show_instance, show_length.seconds, filename, filetype="mp3")
             show.start()
          
             #remove show from shows to record.