Commit Graph

253 Commits

Author SHA1 Message Date
Naomi 85a984e669 CC-2129 : Retry automatic upload to Soundcloud if Internet connection problem
configs for retry, id of soundcloud file is added to database.
2011-03-30 18:15:33 -04:00
Naomi d2fb99eff9 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-30 15:42:36 -04:00
Naomi f184cc596a CC-2110 : Soundcloud file metadata 2011-03-30 15:42:01 -04:00
martin 32c28046ef CC-1990: Widget to display schedule and "Now Playing" on any website
-admin can now enable/disable access to scheduling information to remote widgets via the preferences page.
2011-03-30 15:34:35 -04:00
Naomi a9d288385b CC-2129 : Retry automatic upload to Soundcloud if Internet connection problem
static retries/wait time right now.
2011-03-29 19:36:36 -04:00
martin 161505a6df CC-2044: remove hardcoded settings from application/configs/conf.php
-refactored some code to begin work on this...
2011-03-29 16:10:00 -04:00
martin b73e58551f CC-2128: storageUrlPort in application/configs/conf.php not being used
-fixed
2011-03-29 14:44:51 -04:00
Naomi 5100613049 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-29 12:47:43 -04:00
Naomi 8c522352d7 CC-2110 : Soundcloud file metadata
adding a users function which will prob be used for metadata... when I see what's needed.
2011-03-29 12:47:34 -04:00
martin d745201afe CC-2098: Only push playlists that havent ended yet
-re-added ability to specify to/from time ranges
2011-03-28 18:23:57 -04:00
martin d6c8e8ca3d CC-2092: When listening to a rebroadcast show, UI is telling me show is empty
-Fixed
2011-03-28 18:07:16 -04:00
martin 70dd2a4838 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-28 16:30:00 -04:00
martin 2aa0cd22c6 CC-1990: Widget to display schedule and "Now Playing" on any website
-update to API controller to support new widget
2011-03-28 16:29:50 -04:00
Naomi c0e8152077 CC-2110 : Soundcloud file metadata
added text area to preferences to allow for additional soundcloud tags.
2011-03-28 15:39:01 -04:00
naomiaro df8b9af8f6 CC-2110 : Soundcloud file metadata
uploading show description, show name in filename, tags ready to be uploaded for creator need to figure out what to upload.
2011-03-28 12:10:51 -04:00
naomiaro d067cf0222 Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-24 23:47:08 -04:00
martin 1107a67579 CC-2098: Only push playlists that havent ended yet
-implemented. Removed ability to specify time ranges for now, and defaulted to looking from now to 24 hours ahead.
Being able to specify time ranges was removed, since we are not using bi-directional communication between pypofetch and Airtime server.
2011-03-24 23:43:27 -04:00
naomiaro c727c338af CC-2097: Show-recorder: Use RabbitMQ, api_client, and the structure of pypofetch
using api client now
2011-03-24 23:07:13 -04:00
naomiaro e57b18168a Merge branch 'master' of dev.sourcefabric.org:campcaster 2011-03-23 23:37:01 -04:00
naomiaro 9447f4fb82 CC-2063 : record/rebroadcast icons for calendar display
icons are put on calendar.
2011-03-23 23:36:45 -04:00
paul.baranowski f9c8a7cc11 CC-2096 Schedule changes should be sent to RabbitMQ at most once per user request
Implemented as a plugin to Zend.  Now at most one schedule push to RabbitMQ
will happen per user action.  It's pretty sweet.
2011-03-23 23:24:06 -04:00
martin 5d0e224139 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-23 22:15:28 -04:00
martin 8a2610aa84 CC-1894: Warn users about time zone differences or clock drift problems on the server
-Now using timezone offsets from UTC instead of regions to compare timezones between pypo and the airtime webserver
2011-03-23 22:14:57 -04:00
paul.baranowski d943548f27 CC-2095: Changes to the stream metadata are not pushed to pypo
Fixed.
2011-03-23 18:16:08 -04:00
martin 7c605c4a28 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-23 13:43:22 -04:00
martin d982419b16 CC-1894: Warn users about time zone differences or clock drift problems on the server
-An error msg now appears in pypo log when pypo and server timezones do not match
2011-03-23 13:43:11 -04:00
naomiaro 224fa1a0b8 CC-1985 : Automatic rebroadcast of recorded content
sending group_id instead of playlist id to playout
anything not in a playlist won't have a playlist id
scheduling just a file for rebroadcast shows.
2011-03-23 12:09:29 -04:00
paul.baranowski c4b632e8ad Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-23 01:09:48 -04:00
paul.baranowski 78b33b9e23 CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
Implemented RabbitMQ on the pypo side.  Schedule updates are now
almost instantaneous and we are only polling the server once per
hour if we aren't updated in that time.  Canceling a show happens
right away.
2011-03-23 01:09:27 -04:00
paul.baranowski 7f7800aa2b CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
Fixed minor issue where schedule was pushed back to pypo after updating
the "played" flag for media files and playlists.

Found one other spot where this was happening and fixed it.
2011-03-23 00:27:31 -04:00
paul.baranowski 72c9e44a91 CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
Fixed minor issue where schedule was pushed back to pypo after updating
the "played" flag for media files and playlists.  This isnt necessary.
2011-03-23 00:17:41 -04:00
martin a1d7bcad90 Merge branch 'master' of dev.sourcefabric.org:airtime 2011-03-22 18:08:49 -04:00
naomiaro 8ffcd75682 bug, forgot to delete useless line 2011-03-22 18:07:00 -04:00
martin e92be3c186 CC-1990: Widget to display schedule and "Now Playing" on any website
-First working version, needs to be called using:

<script>
    $(document).ready(function() {
        $("#headerLiveHolder").airtimeLiveInfo();
        $("#onAirToday").airtimeShowSchedule();
    });
</script>
2011-03-22 18:04:27 -04:00
naomiaro 8016737968 Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/models/Shows.php
2011-03-22 12:16:42 -04:00
naomiaro fae71ed051 CC-1985 : Automatic rebroadcast of recorded content
scheduling the recorded file in any rebroadcast shows.
2011-03-22 12:08:09 -04:00
paul.baranowski b650abcbb8 Merge branch 'master' of dev.sourcefabric.org:airtime
Conflicts:
	application/models/Shows.php
2011-03-22 10:00:37 -04:00
paul.baranowski d38e2adb58 CC-2084: Integrate RabbitMQ for immediate schedule updates and commands
This is the code for the server side to push the schedule to RabbitMQ.
Right now it is disabled and should cause no changes in behavior.

Also added comments to functions and formatted code correctly.
2011-03-22 09:55:33 -04:00
naomiaro 864cda6c34 CC-1630 : Automatic recording of shows
multi threading now used in recorded for back to back shows.
recorded file id is put into show instances table.
2011-03-22 00:46:31 -04:00
naomiaro 60649cba8a CC-1987 : Automatic upload of recorded shows to Soundcloud
created Soundcloud.php in models, added upload track method.
using python-setuptools in install to find poster package to be able to upload recoded file to airtime and then to soundcloud.
2011-03-21 15:48:44 -04:00
Naomi 3a0f9ddcd1 CC-1987 : Automatic upload of recorded shows to Soundcloud
Added fields to preference form for the station's soundcloud user/pass
need to generalize file upload as commented out in the new Soundcloud.php file.
2011-03-18 17:15:12 -04:00
Naomi 5ddd670979 CC-1630 : Automatic recording of shows
not going to use ECI python bindings, has deprecated code in the ubuntu package currently
also simpler just to call a subprocess
2011-03-18 15:33:23 -04:00
naomiaro 28b7d8e882 CC-1985 : Automatic rebroadcast of recorded content
can't move a rebroadcast show infront of it's original recorded show,
know how to print form element errors out in a custom view script,
removed show content option from a recorded show's context menu.
2011-03-18 00:20:38 -04:00
naomiaro e3e8f10021 CC-1985 : Automatic rebroadcast of recorded content
added url column to cc_shows table, logic to show/hide form components for rebroadcast
2011-03-17 18:23:05 -04:00
naomiaro 20f3c49dcb CC-1985 : Automatic rebroadcast of recorded content
rebroadcast shows are automatically resized if parent recorded shows are altered.
progress bar is removed from recorded/rebroadcast shows, waiting on special icons.
2011-03-16 11:33:08 -04:00
naomiaro 8f86b05a4b Merge branch 'master' of dev.sourcefabric.org:campcaster
Conflicts:
	application/controllers/ScheduleController.php
	public/css/styles.css
2011-03-15 17:02:22 -04:00
naomiaro bd81b0cd4f CC-1985 : Automatic rebroadcast of recorded content
working on disabling resizing of a rebroadcast show.
2011-03-15 16:39:52 -04:00
naomiaro 29816f32fa CC-1985 : Automatic rebroadcast of recorded content
can add absolute dates/times for non repeating show instances to rebroadcast.
2011-03-15 15:20:10 -04:00
naomiaro 6ef4169315 CC-1985: Automatic rebroadcast of recorded content
populates rebroadcast show instances now, added a new table cc_show_rebroadcast,
added columns record, rebroadcast, instance_id, file_id to cc_show_instances table.
added column record to cc_show_days.
2011-03-15 12:05:41 -04:00
martin a947306222 CC-2002
GUI changes done
2011-03-11 13:56:13 -05:00