Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* SAAS-1197 - fix publish dialog behaviour for tasks with pending states

Browse source 
* SAAS-1184 - more polish on publishing/podcasting
This commit is contained in:
Duncan Sommerville 2015-11-10 17:54:31 -05:00
parent 308457c9f4
commit de380369ed
5 changed files with 56 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

30
airtime_mvc/application/services/PublishService.php
View file

@ -56,21 +56,19 @@ class Application_Service_PublishService {
* ]
*/
public static function getSourceLists($fileId) {
$publishSources = $publishedSources = array();
$sources = array();
foreach (self::$SOURCES as $source => $label) {
$fn = self::$SOURCE_FUNCTIONS[$source];
// Should be in a ternary but PHP doesn't play nice
if (self::$fn($fileId)) {
$publishedSources[$source] = _($label);
} else {
$publishSources[$source] = _($label);
}
$status = self::$fn($fileId);
array_push($sources, array(
"source" => $source,
"label" => _($label),
"status" => $status
));
}
return array(
"toPublish" => $publishSources,
"published" => $publishedSources
);
return $sources;
}
/**
@ -79,8 +77,9 @@ class Application_Service_PublishService {
*
* @param int $fileId the ID of the file to check
*
* @return bool true if the file has been published to SoundCloud,
* otherwise false
* @return int 1 if the file has been published to SoundCloud,
* 0 if the file has yet to be published, or -1 if the
* file is in a pending state
*/
private static function getSoundCloudPublishStatus($fileId) {
$soundcloudService = new Application_Service_SoundcloudService();
@ -94,13 +93,14 @@ class Application_Service_PublishService {
*
* @param int $fileId the ID of the file to check
*
* @return bool true if the file has been published to the Station podcast,
* otherwise false
* @return int 1 if the file has been published to SoundCloud,
* 0 if the file has yet to be published, or -1 if the
* file is in a pending state
*/
private static function getStationPodcastPublishStatus($fileId) {
$stationPodcast = StationPodcastQuery::create()
->findOneByDbPodcastId(Application_Model_Preference::getStationPodcastId());
return $stationPodcast->hasEpisodeForFile($fileId);
return (int) $stationPodcast->hasEpisodeForFile($fileId);
}
}

12
airtime_mvc/application/services/ThirdPartyService.php
View file

@ -79,18 +79,22 @@ abstract class Application_Service_ThirdPartyService {
*
* @param int $fileId the cc_files identifier
*
* @return string the service foreign identifier
* @return int 1 if the file has been published,
* 0 if the file has yet to be published,
* or -1 if the file is in a pending state
*/
public function referenceExists($fileId) {
$ref = ThirdPartyTrackReferencesQuery::create()
->filterByDbService(static::$_SERVICE_NAME)
->findOneByDbFileId($fileId); // There shouldn't be duplicates!
->findOneByDbFileId($fileId);
if (!empty($ref)) {
$task = CeleryTasksQuery::create()
->orderByDbDispatchTime(Criteria::DESC)
->findOneByDbTrackReference($ref->getDbId());
return $task->getDbStatus() != CELERY_FAILED_STATUS;
return $task->getDbStatus() == CELERY_PENDING_STATUS ? -1
: ($task->getDbStatus() == CELERY_FAILED_STATUS ? 0 : 1);
}
return false;
return 0;
}
}