From b4d4c54c31600ba59e145d5a3bc4c986d546871d Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Mon, 3 Oct 2011 18:02:01 -0400
Subject: [PATCH] CC-2795: Give option to set download flag of recorded shows
 uploaded to Soundcloud by default

- fixed name of Soundcloud Model class
---
 airtime_mvc/application/Bootstrap.php                 | 1 +
 airtime_mvc/application/controllers/ApiController.php | 2 +-
 airtime_mvc/application/models/Soundcloud.php         | 4 +---
 airtime_mvc/application/models/StoredFile.php         | 2 +-
 python_apps/api_clients/api_client.py                 | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index f3bf8f561..9bcba177d 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -13,6 +13,7 @@ require_once 'DB.php';
 
 require_once 'Preference.php';
 require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
+require_once 'soundcloud-api/Services/Soundcloud.php';
 
 global $CC_CONFIG, $CC_DBC;
 $dsn = $CC_CONFIG['dsn'];
diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 7d5eb0006..cd6f64da6 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -400,7 +400,7 @@ class ApiController extends Zend_Controller_Action
         		$tags = array_merge($hosts, array($show_name));
 
         		try {
-        			$soundcloud = new Application_Model_AtSoundcloud();
+        			$soundcloud = new Application_Model_Soundcloud();
         			$soundcloud_id = $soundcloud->uploadTrack($file->getFilePath(), $tmpTitle, $description, $tags, $show_start_time, $show_genre);
         			$file->setSoundCloudFileId($soundcloud_id);
         			break;
diff --git a/airtime_mvc/application/models/Soundcloud.php b/airtime_mvc/application/models/Soundcloud.php
index 671ac5ec2..c962a5646 100644
--- a/airtime_mvc/application/models/Soundcloud.php
+++ b/airtime_mvc/application/models/Soundcloud.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once 'soundcloud-api/Services/Soundcloud.php';
-
-class Application_Model_AtSoundcloud {
+class Application_Model_Soundcloud {
 
     private $_soundcloud;
 
diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php
index 4a33a1492..15ffa6d28 100644
--- a/airtime_mvc/application/models/StoredFile.php
+++ b/airtime_mvc/application/models/StoredFile.php
@@ -944,7 +944,7 @@ class Application_Model_StoredFile {
                 $genre = $file->getDbGenre();
                 $release = $file->getDbYear();
                 try {
-                    $soundcloud = new Application_Model_AtSoundcloud();
+                    $soundcloud = new Application_Model_Soundcloud();
                     $soundcloud_id = $soundcloud->uploadTrack($this->getFilePath(), $this->getName(), $description, $tag, $release, $genre);
                     $this->setSoundCloudFileId($soundcloud_id);
                     break;
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index f8e389daa..c98f4433e 100755
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -426,8 +426,8 @@ class AirTimeApiClient(ApiClientInterface):
                 url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["upload_recorded"])
                 url = url.replace("%%fileid%%", str(response[u'id']))
                 url = url.replace("%%showinstanceid%%", str(md['MDATA_KEY_TRACKNUMBER']))
-                logger.debug(url)
                 url = url.replace("%%api_key%%", self.config["api_key"])
+                logger.debug(url)
 
                 req = urllib2.Request(url)
                 response = urllib2.urlopen(req).read()