3b9b23a7dd
Merge branch '2.3.x-saas' into 2.4.x-saas
...
Conflicts:
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/models/Schedule.php
python_apps/pypo/airtime-playout
2013-05-21 16:40:10 -04:00
8e617b33de
add ability to use id's with mksafe operator
2013-05-21 16:31:32 -04:00
76a02796b7
implement method stub
2013-05-17 12:16:04 -04:00
d205b0dbd3
remove string literal
2013-05-17 12:14:33 -04:00
59785a952f
make up for lack of 'total_seconds()' lib function for pre 2.7 version of python
2013-05-16 12:25:21 -04:00
d2f29b1f88
more informative message to user about new init.d script behaviour
2013-05-16 12:08:32 -04:00
1ab27e3cf8
be more idiomatic
2013-05-15 17:18:42 -04:00
95bb5b2f36
CC-5153:
...
Cancel show won't cut off current song after airtime-playout is restarted
-fixed
2013-05-15 17:18:15 -04:00
8545803dbf
CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00
...
-slightly better way of not writing cue-in/cue-out
2013-05-15 13:19:29 -04:00
4a82fe2e52
Revert "CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00"
...
This reverts commit 9ad42b2b2c
2013-05-15 13:13:37 -04:00
ba3703b556
Revert "CC-5126:"
...
This reverts commit a2b500729c
2013-05-15 13:10:56 -04:00
80686b7063
add parameter parsing to airtime-liquidsoap script.
...
-Allow us to prevent running as daemon
2013-05-15 13:06:16 -04:00
9ad42b2b2c
CC-5126: Media Monitor: Exception happens when cuein value is 00:00:00
...
-also removed functions that query for cue-in/cue-out,
since we don't care about these.
2013-05-14 22:26:48 -04:00
a2b500729c
CC-5126:
...
Media Monitor: Exception happens when cuein value is 00:00:00
-fixed this be ensuring we're not writing cue-in/out values to the file.
This should never have been allowed.
2013-05-14 22:16:30 -04:00
c693c4b015
remoe id's for mksafe (they aren't supported params)
2013-05-14 15:14:57 -04:00
a59fc69d17
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-14 15:10:13 -04:00
b3f0a2fcdd
CC-5144:
...
SHOUTcast listener stats auth not working
2013-05-14 15:10:04 -04:00
298e5a9b77
better idenfication of which mksafe is being applied
2013-05-13 17:52:43 -04:00
f5a0d0a9a4
CC-5123:
...
Pypo: Redundant Pypopush happens after restart pypo service
-was clearing the queue after fetching the schedule :S
2013-05-13 17:52:22 -04:00
be465be9b2
CC-5133: Make sure Liquidsoap 1.1.1 is used
...
add missing file
2013-05-13 16:10:21 -04:00
85afe53c89
CC-5133: Make sure Liquidsoap 1.1.1 is used
...
fixed
2013-05-13 15:45:56 -04:00
28576adf42
disable liquidsoap's add operator normalizing audio
2013-05-10 23:19:54 -04:00
d06b2f3f94
CC-5116:
...
Please add opus into the file name filter
-fixed
2013-05-08 17:06:50 -04:00
4dba722272
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-08 16:53:42 -04:00
56b9d0580f
CC-5071:
...
Better RabbitMQ passwords
-fixed
2013-05-08 15:25:30 -04:00
f0e846db75
CC-5049: Error messages on Liquidsoap start up/shut down after Airtime install
...
fixed
2013-05-08 13:47:24 -04:00
3ae3c7e802
sanity check to warn if cue_out - cue_in != end - start
2013-05-07 15:05:14 -04:00
81b2012a45
remove some overly-verbose logging
2013-05-07 13:25:21 -04:00
1895686c85
CC-5098: Liquidsoap: Restart liquidsoap will make the output stream silence until next song starts
...
-fixed
2013-05-06 16:39:17 -04:00
2fc4afef68
ensure a proper environment everytime we restart liquidsoap
2013-05-06 12:11:19 -04:00
2eaf81d366
ensure a proper environment everytime we restart liquidsoap
2013-05-06 12:08:57 -04:00
3a1048bdec
ensure pypo registers with server before doing Liquidsoap check
2013-05-06 11:42:39 -04:00
ec7eb5f264
CC-5094 Liquidsoap crash if unsupported encoder in the liq script
...
-keep up with liquidsoap changes
2013-05-04 14:11:21 -04:00
fdcfc4d06c
CC-5094
...
Liquidsoap crash if unsupported encoder in the liq script
2013-05-04 10:57:22 -04:00
6c42064c14
refactor methods into appropriate locations
2013-05-02 18:46:16 -04:00
84efb4a9b7
work around to work with annoying static methods - should remove these later..
2013-05-02 17:59:03 -04:00
1e25d786ee
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-02 17:31:42 -04:00
f2564cf732
temporarily disable opus + aac until liquidsoap binaries are ready
2013-05-02 16:09:04 -04:00
88ba36601f
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-05-01 00:37:26 -04:00
623a67d6aa
CC-5072:
...
Ensure all api requests are returning valid JSON
-fixed
2013-04-26 18:27:40 -04:00
21b84c153a
better logging for return values
2013-04-26 17:54:52 -04:00
21bed91678
add brackets to force operator precedence
2013-04-26 15:56:48 -04:00
49d1755b52
fix incorrect merge
2013-04-26 13:58:44 -04:00
705329ee5d
cleanup of unecessary code
...
-we shouldn't be loading config file multiple times.
2013-04-26 13:48:15 -04:00
6cc366b100
CC-5069:
...
Airtime 2.4 upgrade scripts
-initial commit
2013-04-26 13:43:40 -04:00
655c1eb5a9
CC-5043:
...
Invalid literal for float error from mutagen
2013-04-26 11:37:46 -04:00
628e075828
pypo syntax error
2013-04-26 11:35:52 -04:00
1158fc2c9e
more legible comment
2013-04-25 22:38:06 -04:00
ca86d6b68b
fix potential out-of-bounds string index error
2013-04-25 22:36:21 -04:00
7bf6f3669b
more stringent verification of equivalence between tracks
2013-04-25 22:33:03 -04:00
039d8a7c0f
fix worst offenders of > 80 character row length
2013-04-25 22:32:27 -04:00
1a765e6cb9
Merge branch 'master' of dev.sourcefabric.org:airtime
...
Conflicts:
python_apps/pypo/pypocli.py
python_apps/pypo/pypofetch.py
python_apps/pypo/pypopush.py
2013-04-25 22:20:03 -04:00
fb4a02faec
cleanup of unecessary code
...
-we shouldn't be loading config file multiple times.
2013-04-25 22:11:26 -04:00
5b2e8e221f
Merge branch 'CC-4417-opus-support'
...
Conflicts:
python_apps/pypo/airtime-liquidsoap
2013-04-25 18:23:37 -04:00
ccd3293f3d
CC-4417: Opus codec support
2013-04-25 18:23:02 -04:00
45ac5282b8
clean unused import
2013-04-24 15:16:50 -04:00
80bd57ce4e
CC-5050: Tracks with a very high track count cannot be saved into database
...
-fixed
2013-04-22 17:54:25 -04:00
07f0ae6c28
CC-1469: Crossfading support (non-equal power)
...
-fix restarting airtime playout not resyncing to schedule correctly
2013-04-22 17:33:56 -04:00
96579b7ef4
CC-5057: Pypopush error: no attribute 'push_item'
...
-fixed
2013-04-22 16:48:52 -04:00
54a9f50055
CC-5004: Fix mistake in api_client.cfg
...
-fixed by simply removing all unnecessary stuff to python file
2013-04-18 18:02:54 -04:00
479e69de12
CC-5009:
...
Use Silan to silently update track length in the background
-done
2013-04-18 15:40:33 -04:00
10fb9c9165
Merge branch '2.3.x' into 2.3.x-saas
2013-04-08 18:56:12 -04:00
5cb950e43f
Merge branch '2.3.x'
2013-04-08 18:55:54 -04:00
5b4bc038b0
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-04-08 18:53:49 -04:00
aca651a1b4
better logging
2013-04-08 18:53:35 -04:00
f13f6c6a70
Merge branch 'master' of dev.sourcefabric.org:airtime
2013-04-07 20:20:57 -04:00
0d45d7b8cd
CC-5042:
...
Do process matching by process name instead of PID file
-fixed
2013-04-07 20:19:51 -04:00
67e3803189
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 17:33:19 -04:00
db5d2283f4
Merge branch '2.3.x'
...
Conflicts:
python_apps/pypo/pypofetch.py
2013-04-05 17:33:02 -04:00
3d135a9f4a
improved logging on why files sometimes aren't removed
2013-04-05 17:31:55 -04:00
18574fd10f
Merge branch '2.3.x'
2013-04-05 15:57:54 -04:00
5b1383d48d
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 15:57:41 -04:00
5ff7ce857f
use sigkill immediately for unresponsive telnet
...
-fix order of arguments
2013-04-05 15:57:16 -04:00
92d0a6178e
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 15:34:04 -04:00
4595aab694
Merge branch '2.3.x'
2013-04-05 15:33:48 -04:00
d1f655d79d
CC-5038: Silan error: list index out of range
...
-fixed
2013-04-05 15:32:44 -04:00
afb55c7b51
CC-5038:
...
Silan error: list index out of range
cosmetic bug fix to prevent so much logging
2013-04-05 14:20:34 -04:00
1a389a3765
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 13:57:46 -04:00
08c93e10fd
Merge branch '2.3.x'
2013-04-05 13:57:32 -04:00
cdb53048c7
ensure that an empty listener stats dict is not sent to the server
2013-04-05 13:56:41 -04:00
1a8ab6cd89
Merge branch '2.3.x'
2013-04-05 12:43:01 -04:00
7727b72e68
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 12:42:34 -04:00
266823b1d9
use sigkill immediately for unresponsive telnet
2013-04-05 12:42:05 -04:00
2b019c4615
Merge branch '2.3.x'
2013-04-05 11:28:47 -04:00
a0bfbce61b
Merge branch '2.3.x' into 2.3.x-saas
2013-04-05 11:28:07 -04:00
f8dbbe71ab
increase monit timeout after liquidsoap starts to 30 seconds.
2013-04-05 11:27:45 -04:00
b988cda2d1
monit alerts in saas
2013-04-04 16:30:39 -04:00
fcbac2a044
Merge branch '2.3.x' into devel
2013-04-04 15:15:19 -04:00
a061464ffb
Merge branch '2.3.x' into 2.3.x-saas
2013-04-04 15:14:04 -04:00
301115c035
CC-5039: Encoded forward slash causing lots of apache error logs
...
-fixed: data should have been sent as POST rather than GET
2013-04-04 15:12:52 -04:00
61f8e64329
Merge branch '2.3.x' into devel
2013-04-03 17:59:04 -04:00
6c0b0f7732
Merge branch '2.3.x' into 2.3.x-saas
2013-04-03 17:58:51 -04:00
3c68a295b4
CC-5039:
...
Encoded forward slash causing lots of apache error logs
-fixed: data should have been sent as POST rather than GET
2013-04-03 17:57:29 -04:00
5dd54783c0
Merge branch '2.3.x' into 2.3.x-saas
2013-04-03 16:48:37 -04:00
e2e6a4263c
Merge branch '2.3.x' into devel
2013-04-03 16:48:19 -04:00
ec7c898f5a
fix some problems with invalid Liquidsoap PID file
2013-04-03 16:47:46 -04:00
bfb252edf5
CC-4417: Opus codec support
2013-04-03 11:40:57 -04:00
2d2aa8eb46
Merge branch '2.3.x' into 2.3.x-saas
2013-04-02 12:31:03 -04:00
0bb7fa4975
don't change monit monitor state on service start/stop
2013-04-02 12:30:15 -04:00
811abc4baf
don't change monit monitor state on service start/stop
2013-04-01 19:31:13 -04:00
01cca88c58
Merge branch '2.3.x' into 2.3.x-saas
2013-03-26 15:02:43 -04:00
894887bd62
Merge branch '2.3.x' into devel
2013-03-26 15:02:17 -04:00
caa2413fd8
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-03-26 15:02:08 -04:00
7237d48ef6
fix missing import
2013-03-26 15:01:53 -04:00
d79bfaaef9
-fix infinite loop on invalid files
2013-03-26 15:01:44 -04:00
5ab52b12c7
CC-4417:
...
Opus codec support
2013-03-26 15:00:41 -04:00
38f8a0d231
more robust handling if system permissions go wrong
2013-03-24 22:58:13 -04:00
89983bd4f8
remove unnecessary file delete
2013-03-24 22:25:38 -04:00
a5c8b7624e
CC-1469: Crossfading support (non-equal power)
...
-handle file attributes changing (end time, replaygain etc.)
2013-03-22 15:56:05 -04:00
7a6940c96c
Merge branch 'cc-1469-crossfade' into devel
...
Conflicts:
python_apps/pypo/pypopush.py
2013-03-22 15:24:14 -04:00
8a5c82d71a
CC-1469: Crossfading support (non-equal power)
...
-fix few bugs
2013-03-22 15:21:28 -04:00
2fc1612460
Merge branch '2.3.x' into devel
2013-03-22 14:24:37 -04:00
00475275e5
Merge branch '2.3.x' into 2.3.x-saas
2013-03-22 14:24:12 -04:00
fc6742869f
better frozen liquidsoap handling
2013-03-22 14:23:42 -04:00
6d1025507a
Merge branch '2.3.x' into devel
2013-03-22 14:05:08 -04:00
19753429dc
add wait timer before liquidsoap is shutdown
2013-03-22 14:04:50 -04:00
33ca2e7c9c
CC-1469: Crossfading support (non-equal power)
...
-refactor
2013-03-22 12:16:17 -04:00
708d36ba9c
syntax error
2013-03-19 15:22:27 -04:00
6dae7d3973
CC-1469: Crossfading support (non-equal power)
...
-cleanup
2013-03-15 17:00:36 -04:00
445573dcdb
CC-1469: Crossfading support (non-equal power)
...
-webstreams scheduled in the future are now working...
2013-03-15 15:07:55 -04:00
dd7fc61e23
CC-1469: Crossfading support (non-equal power)
...
-further implementation..
2013-03-15 12:50:23 -04:00
2b7ebafa94
CC-1469: Crossfading support (non-equal power)
...
-further implementation..
2013-03-14 18:29:52 -04:00
91d1243554
CC-1469:
...
Crossfading support (non-equal power)
-initial commit
2013-03-14 16:50:55 -04:00
13b3eec0ad
Merge branch '2.3.x' into 2.3.x-saas
2013-03-12 16:38:16 -04:00
661a407f72
CC-5016: Allow user control for webstream metadata format
...
-fixed
2013-03-08 16:45:19 -05:00
fe96b66fd7
CC-5016:
...
Allow user control for webstream metadata format
-fixed
2013-03-08 16:00:16 -05:00
0075b27947
CC-5015: Allow for cue_out points to be Null in DB
...
-prep for 2.4
2013-03-08 14:57:20 -05:00
635dfd356d
Merge branch '2.3.x' into devel
2013-03-08 12:39:47 -05:00
30970598fe
minor fixes
...
-don't show print subprocess commands to py-interpreter.log
2013-03-08 12:39:29 -05:00
3969e38d51
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-03-07 18:34:10 -05:00
c2fb811100
CC-5012:
...
remove all shell=True commands for subprocess calls
-fixed
2013-03-07 18:33:55 -05:00
fc261035a8
CC-4999: Do silan analysis quietly in the background
...
-set silan nice level to 19
2013-03-06 19:48:35 -05:00
3497a3730c
Merge branch '2.3.x' into devel
2013-03-06 18:24:48 -05:00
0321464ab8
CC-4999:
...
Do silan analysis quietly in the background
-fixed
2013-03-06 18:24:19 -05:00
43ffa2aece
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/SystemstatusController.php
2013-03-06 13:47:21 -05:00
5ceeb88899
Merge branch '2.3.x' into devel
2013-03-06 13:46:01 -05:00
7ca178295f
CC-4993: airtime-check-system reports airtime-liquidsoap as down
...
-fixed
2013-03-06 13:43:22 -05:00
8e314477c7
CC-5005: airtime-purge doesn't remove all files
...
-cleanup
2013-03-06 12:26:07 -05:00
e669b7a91a
refactor some liquidsoap code + remove unused --data argument
2013-03-05 17:31:09 -05:00
7039493ea1
2.3.1 preparation
2013-03-05 17:00:52 -05:00
1c80701488
Merge branch '2.3.x' into 2.3.x-saas
2013-03-05 16:21:47 -05:00
cc69418215
Merge branch '2.3.x' into devel
2013-03-05 16:21:22 -05:00
215e5ccb4c
CC-5001: remove /etc/monit/conf.d/monit-airtime-rabbitmq-server.cfg on 2.3.1 upgrade
...
-don't even install rabbitmq monit file
2013-03-05 16:21:05 -05:00
c747b6ad47
CC-4978: Media Monitor: importing file slowly
...
-disable silan on file import
-silan will need to be done manually for now using airtime-silan
2013-03-04 16:00:14 -05:00
b744ab74ee
Merge branch '2.3.x' into 2.3.x-saas
2013-03-01 18:22:12 -05:00
05b988fc6a
CC-4758: File removed before Liquidsoap finishes reading it?
...
-fixed
2013-03-01 16:15:28 -05:00
259f70bc21
CC-4915: Media-Monitor cannot handle rabbitmq restart event
...
-fixed
2013-03-01 16:05:55 -05:00
764ee0389f
CC-4916: Pypo cannot handle Schedule updates after rabbitmq restart happens
...
-fixed
2013-03-01 15:52:41 -05:00
2f33e99ff5
CC-4915: Media-Monitor cannot handle rabbitmq restart event
...
-fixed
2013-03-01 15:52:19 -05:00
d4891803cc
CC-4989: upgrade to mutagen 1.21
...
-done
2013-03-01 14:58:26 -05:00
0f7063e8a6
another refactor of the switches in LS
2013-03-01 12:48:32 -05:00
7e19eba7e1
another refactor of LS source
2013-03-01 11:44:11 -05:00
6624911d2c
minor refactor of LS code
2013-02-28 18:54:23 -05:00
ae503121d8
CC-4984: Exception for replaygain
...
-fixed
2013-02-28 18:26:15 -05:00
5ae4ed67a5
CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg
...
-fixed
2013-02-28 16:33:59 -05:00
66fbfa1554
CC-4986: Installation fail because of monit-airtime-liquidsoap.cfg
...
-fixed
2013-02-28 16:27:52 -05:00
b3ecb477be
minor refactor of LS code
2013-02-27 17:48:10 -05:00
fbaba59dca
CC-4974: Watchdog for ensuring Liquidsoap does not consume more than 1GB of memory
...
-changed to 600MB for now. May lower even more later
2013-02-26 14:47:48 -05:00
15f2533225
less verbose logging
2013-02-26 13:34:05 -05:00
0c88949eb2
potential future optimization by using -b silan option
...
-in the future this -b should be quicker for silan
2013-02-26 13:33:56 -05:00
1e1d291124
CC-4888: Add unofficial support for AAC plugin
...
-fixed
2013-02-26 12:06:22 -05:00
e08732fba7
CC-4975: airtime-silan cmd error
...
-fixed
2013-02-25 19:45:26 -05:00
e35416b1e8
undo - make sure path names are quoted when passing to lsof
2013-02-25 17:43:02 -05:00
deb50ea769
make sure path names are quoted when passing to lsof
2013-02-25 16:44:28 -05:00
b06fd8b3d3
Merge branch '2.3.x' into devel
2013-02-22 12:09:02 -05:00
8573a005c9
Merge branch '2.3.x' into 2.3.x-saas
2013-02-22 12:08:40 -05:00
57183b8ac8
prevent creation of Zombie processes when running lsof
2013-02-22 12:03:39 -05:00
168a364da5
Merge branch '2.3.x' into devel
2013-02-20 14:42:35 -05:00
8bec9dea55
Merge branch '2.3.x' into 2.3.x-saas
2013-02-20 14:41:55 -05:00
8f53871ddc
CC-4970: Process return codes aren't "reaped" after exiting - Zombie processes are created.
...
-fixed
2013-02-20 14:40:16 -05:00
e3f4e91bef
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-02-15 17:06:42 -05:00
f2773fcb01
Merge branch '2.3.x' of dev.sourcefabric.org:airtime into 2.3.x
2013-02-15 16:32:43 -05:00
fe611e7c6a
CC-4957 : Replay Gain undefined error, json response not being sent back properly.
2013-02-15 16:32:05 -05:00
9715a9ad6d
CC-4883: Python services contacting Apache with strange URL format
...
-fixed
2013-02-15 12:55:57 -05:00
c398ce930b
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
2013-02-04 16:22:35 -05:00
331386f74f
CC-4910: Need to properly handle non-200 http status codes in api client
...
-fixed
2013-02-04 16:05:58 -05:00
34eee60bee
CC-4910: Need to properly handle non-200 http status codes in api client
...
-wrap all service calls in exception
2013-02-03 00:40:41 -05:00
04a956217f
Merge branch '2.3.x' into 2.3.x-saas
2013-02-02 08:51:06 -05:00
1f4cfa8f65
fix pypo not auto restarting
2013-02-02 08:50:44 -05:00
27ccefbf0f
Merge branch '2.3.x' into 2.3.x-saas
2013-02-01 01:41:16 -05:00
149b744ba7
remove using self in a static method
2013-02-01 01:40:48 -05:00
f145ede01b
CC-4905: Unit tests for Pypo
...
-whitespace removal
2013-01-31 17:45:57 -05:00
9053266a14
Merge branch '2.3.x' into 2.3.x-saas
2013-01-31 12:33:38 -05:00
8adb4b259c
CC-4905: Unit tests for Pypo
2013-01-31 12:33:14 -05:00
0a198ae424
Merge branch '2.3.x' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00
e459f739f2
indentation error fix
2013-01-30 11:29:28 -05:00
2a0cc9e45f
fix indentation
2013-01-30 11:23:20 -05:00
9d4e0d2dd1
Merge branch 'martin' into 2.3.x
2013-01-29 12:17:36 -05:00
28c01760dd
be more gentle to Liquidsoap when sending lots of commands
2013-01-29 12:17:05 -05:00
db4e6bb94a
CC-4889: API client URL request is not wrapping in try/catch
...
-fixed
2013-01-29 10:29:29 -05:00
9d8a9faca8
make code formatting easier on eyes
2013-01-28 17:00:35 -05:00
d7358338f0
improved logging in pypo fetch
2013-01-28 17:00:16 -05:00
b389e44001
take liquidsoap by the horns if it misbehaves.
2013-01-27 15:00:56 -05:00
c93b90cc54
prepare for improvements to way pypo communicates with LS
2013-01-26 20:05:31 -05:00
ea9e97d834
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 15:15:07 -05:00
807aa6b4a6
fix restart liquidsoap being sent as default no arguments for pypo-notify
2013-01-25 15:14:40 -05:00
22aafda2a8
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 14:17:23 -05:00
8dd7ffee8c
locks should occur inside try/catch
2013-01-25 14:16:53 -05:00
7c327e4c75
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 12:12:21 -05:00
21a04803e5
Fix Pypo giving up too early on attempting to receive schedule
2013-01-25 12:11:50 -05:00
d5894279c4
Merge branch '2.3.x' into 2.3.x-saas
2013-01-25 11:30:46 -05:00
7b3850fac6
false not being returned on connection error
2013-01-25 11:30:36 -05:00
6f5ffdc1e7
Merge branch '2.3.x' into 2.3.x-saas
2013-01-24 17:49:08 -05:00
c6ee5bfe58
prepare baby mm for saas
2013-01-22 13:02:45 -05:00
b637365f55
add some missing statements in the sql upgrade script
2013-01-18 15:58:00 -05:00
f8208a355c
Merge branch 'devel' into 2.3.x-saas
2013-01-18 12:22:45 -05:00
ed7b22118c
Merge branch 'silan-script' into devel
2013-01-18 11:54:10 -05:00
f70ca93b53
CC-4841: Silan script
...
done
2013-01-18 11:53:26 -05:00
74877b289e
CC-4843: Make listener stats work with SaaS in 2.3.x-saas branch
...
-fixed
2013-01-16 14:05:45 -05:00
e98d6e92bb
Merge branch 'devel' into 2.3.x-saas
2013-01-15 15:38:27 -05:00
bbedce2951
Changed default base directory in airtime.conf and api_client.cfg
2013-01-15 13:47:35 -05:00
8cd6bd9aa4
Merge branch 'devel' into 2.3.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/forms/AddShowWhen.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/SoundcloudPreferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_general.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
airtime_mvc/public/js/airtime/preferences/preferences.js
python_apps/api_clients/api_client.py
python_apps/pypo/listenerstat.py
2013-01-15 13:44:44 -05:00
c266bf189f
upgrade version number to 2.3.0
2013-01-15 12:31:41 -05:00
1d6ff24242
SAAS-298: Issues with http://iqkidsradio.airtime.pro/Schedule
...
potential fix
2013-01-10 10:29:57 -05:00
6e7f45e615
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:32:39 -05:00
1263c04621
CC-4796: Listener Stat: Authentication exception happens but no warning message on UI
...
- done
2013-01-08 17:32:27 -05:00
8b8e12a234
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-08 17:23:28 -05:00
e79066de55
CC-4760: Airtime fails to play out 2nd webstream upon switching from one webstream to another
...
-fix attempt
2013-01-08 17:23:21 -05:00
adda497bbb
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 15:52:11 -05:00
b580a7be73
CC-4812: Property "off_air_meta" will block airtime-liquidsoap to start
...
- fixed
2013-01-08 12:31:14 -05:00
6e241fd3ec
CC-4512: Allow changing stream "Offline" message via Web UI
...
- fixed
2013-01-07 18:14:57 -05:00
225a5d8f48
CC-4733: Stream statistics for Shoutcast users
...
-initial implementation
2013-01-04 18:32:20 -05:00
5d76bb2d17
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2013-01-03 18:00:33 -05:00
ae7b6fe092
CC-4732: Ask for admin username + password in Stream Settings page
...
- done
2013-01-03 17:58:50 -05:00
5df867d142
remove whitespace
2013-01-03 15:05:31 -05:00
a05259bd8f
CC-4771: System -> Streams: It will restart liquidsoap every time when I click "Save" button without changing anything
...
- fixed
2013-01-03 14:42:12 -05:00
f5b6d85406
CC-3018: Automatically strip out silence from audio tracks
...
- adding logging
2013-01-03 14:30:19 -05:00
a1837366be
Merge branch 'cc-3018-silence-detection' into devel
2013-01-03 14:08:21 -05:00
f936f510c5
CC-3018: Automatically strip out silence from audio tracks
...
- adding try/catch
2013-01-03 14:07:34 -05:00
b8f80866cf
CC-3018: Automatically strip out silence from audio tracks
...
- done
2013-01-03 14:02:06 -05:00
f2322e4f76
-disable liquidsoap playability test
2013-01-03 11:48:00 -05:00
77da642996
-fix missing import
2013-01-02 17:49:06 -05:00
2589b133d9
CC-4343: Unflushed events loop in media monitor
...
-fixed
2013-01-02 16:58:24 -05:00
b9d829a33c
CC-4754: Replay gain modifier
...
-make pypo repush song if its replay_gain changed
2012-12-28 13:58:55 -05:00
0596d1c391
Merge branch 'cc-4759-add-aac-stream-in-support' into devel
...
Conflicts:
python_apps/media-monitor2/media/monitor/pure.py
2012-12-27 17:29:25 -05:00
fc09e8cd74
Merge branch '2.2.x' into 2.2.x-saas
2012-12-03 17:08:49 -05:00
735ad30483
CC-4726: Sometimes mm doesn't start after a fresh install
...
-fixed
2012-12-03 16:56:11 -05:00
e3761bd8d6
-make sure lsof works for files with spaces
2012-12-03 16:33:24 -05:00
b2699fa914
merge from devel
2012-12-03 11:06:56 -05:00
4983721565
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/forms/LiveStreamingPreferences.php
2012-11-28 16:10:33 -05:00
7249e36081
-2.2.1 upgrade scripts
2012-11-27 12:13:16 -05:00
735640d40b
Merge branch 'lsof_quote_fix' of https://github.com/rgrinberg/Airtime into devel
2012-11-23 16:18:23 -05:00
50bdeeef26
CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
2012-11-23 16:00:10 -05:00
8d3024d42e
api_client fix
2012-11-22 15:59:37 -05:00
da6013b523
CC-4717: Lintian warnings from devel branch
...
- fixed
2012-11-22 15:14:55 -05:00
612ac415d2
cc-4708: cue points not working
...
-fixed
2012-11-22 12:24:59 -05:00
3a1945a818
CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
...
-fixed
2012-11-22 11:40:44 -05:00
8cc162f7a9
CC-4716: Cannot hear fade in & fade out
...
- fixed
2012-11-21 17:34:07 -05:00
1f5a5fd294
typo
2012-11-21 17:24:31 -05:00
0e91188939
made a unique toucher file
2012-11-21 17:22:32 -05:00
8c97995c2f
Added vulnerability where strings would not be escaped when pass to shell command
2012-11-21 12:55:57 -05:00
8aa11f7e8c
Better error message for api client constructor
2012-11-21 12:26:37 -05:00
ac6a5a11bf
docstring fixes
2012-11-20 16:41:45 -05:00
383244f962
changed implementation of timer thread because using threading.Timer does not allow us to properly inject
...
the AirtimeInstance object.
2012-11-20 14:44:58 -05:00
95e757a52c
removed file mediator because it seems to be useless and incompatible with saas
2012-11-20 14:44:24 -05:00
58d888a59f
Small refactoring to let user be assignable from any class that inherits from HasUser
2012-11-20 14:43:48 -05:00
58662b42be
fixed typo missing self
2012-11-20 12:11:31 -05:00
fed39077c0
Merge branch '2.2.x' into devel
2012-11-20 11:21:29 -05:00
c1959f936e
added TODO + formatting
2012-11-19 20:16:06 -05:00
fdf8c9fb4e
refactored EventRegistry to play nice with saas.
2012-11-19 20:13:19 -05:00
ebca3fa9f5
refactored file mediator to play nice with saas
2012-11-19 20:13:00 -05:00
8696571b02
refactor owner to be saas friendly
2012-11-19 19:57:33 -05:00
a28c9d9e27
added untracked configs
2012-11-19 16:46:47 -05:00
a995129df5
added general getsig routine to get the correct signals from anywhere in the code.
2012-11-19 16:07:40 -05:00
4acb7d92db
removed hardcoded signals in the code.
2012-11-19 16:07:26 -05:00
6101e9dfe3
fixed bug where only part of the path was joined.
2012-11-19 16:06:36 -05:00
e46da35d3b
made root path a variable to remove duplication.
2012-11-19 16:06:19 -05:00
cd7d292aa5
fixed faulty regex.
2012-11-19 16:05:52 -05:00
9d04204389
fixed bug where path was only relative.
2012-11-19 16:05:26 -05:00
8dd0d80f68
fixed typo that was causing bug
2012-11-19 16:04:43 -05:00
dc8315fef9
added more detailed output when launching baby mm
2012-11-19 16:04:22 -05:00
d595d1112f
added routine to verify config exists in "baby" media monitor"
2012-11-19 16:03:58 -05:00
647832b0a0
added comments to document config options
2012-11-19 16:03:25 -05:00
c784df7f6e
Added comments describing config options
2012-11-19 11:35:37 -05:00
1cbe2fb1a1
typo
2012-11-16 12:59:17 -05:00
57b2762e5c
cleaned up imports
2012-11-16 12:51:23 -05:00
bc9f7c4c95
removed hardcoding of path received from MM for SaaS.
2012-11-16 12:51:07 -05:00
cf6e1d66ee
removed direct usage of api client to AirtimeDB which encapsulates that behaviour
2012-11-16 12:36:58 -05:00
11214d754d
docstring formatting
2012-11-16 12:31:10 -05:00
e22162cc87
added initialization message
2012-11-16 12:29:06 -05:00
aeb449ea76
import formatting
2012-11-16 11:15:49 -05:00
a50995cd9b
formatting + clearer name.
2012-11-16 11:14:31 -05:00
cc66ac4a83
typo
2012-11-16 11:14:18 -05:00
7527b366d0
removed instance specific logging
2012-11-16 00:10:40 -05:00
757a561975
added missing import
2012-11-16 00:10:24 -05:00
26ad6dae74
Added a convenience constructor for an AirtimeInstance
2012-11-16 00:09:56 -05:00
e12e311537
Added some routines to baby mm.
2012-11-16 00:09:33 -05:00
62b3c39c5b
CC-4702: Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
...
-fixed
2012-11-15 17:35:06 -05:00
5f534b5ef6
CC-4702Webstream: When webstream is playing, it isn't marked as 'media_item_played' in cc_schedule
2012-11-15 17:29:25 -05:00
8c73731c41
CC-4633: Use David's new method of Liquidsoap webstream switching
...
-fixed
2012-11-15 16:43:22 -05:00
88231a19c3
added baby mm launcher
2012-11-15 15:08:49 -05:00
9c74b0ea2c
removed bastard injection from AirtimeApiClient
2012-11-15 15:08:18 -05:00
350c6e2f94
moved logging logic to launcher
2012-11-15 15:02:26 -05:00
11a43eb891
Generalized a lot of launching logic into the saas launcher away from the hosted installation script: mm2.py.
2012-11-15 14:49:55 -05:00
c43dbe42a8
refactored creating an instance into its own function
2012-11-15 14:27:09 -05:00
975508a549
added TODO
2012-11-15 14:24:17 -05:00
57b13607c5
removed crap hacks
2012-11-15 14:22:42 -05:00
2010778876
cleanup redundant code, remove whitespace
2012-11-15 13:33:27 -05:00
0b0e96f49c
removed old runner code
2012-11-15 12:46:57 -05:00
8a7535774c
fixed import typo
2012-11-15 12:13:52 -05:00
4ac3efe228
renamed typo log to logger.
2012-11-15 12:13:33 -05:00
5073ced732
Made timeout watcher provide AirtimeInstnace
2012-11-15 12:12:47 -05:00
fa66f33ffa
changed RequestSync to use injected apc and injected it in ThreadedRequestedSync.
2012-11-15 12:12:19 -05:00
15f4212360
make ManagerTimeout provide the correct AirtimeInstance object.
2012-11-15 12:11:48 -05:00
ab35263869
inject apc properly into AirtimeNotifier
2012-11-15 12:11:18 -05:00
7ed1f08e07
Added new launch script for mm.
2012-11-15 12:10:52 -05:00
ce4dbf0028
added launcher that should replace most of mm2.py
2012-11-14 22:06:09 -05:00
dd139e5028
added default value for exception class parameter
2012-11-14 16:50:34 -05:00
fcfa5cceee
removed useless comment
2012-11-14 14:49:28 -05:00
2e59eca131
moved files to pypo dir
2012-11-14 14:43:33 -05:00
d5cacf4011
moved replay gain to pypo for better saas performance
2012-11-14 14:43:10 -05:00
f1effc37a9
removed dependency of mm from replaygain
2012-11-14 11:51:00 -05:00
93ff2ce9f6
removed extra import
2012-11-13 17:32:42 -05:00
6f42291f8a
merge api client conflict
2012-11-13 17:21:48 -05:00
dfede98b82
Merge branch '2.2.x-saas' of dev.sourcefabric.org:airtime into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/models/Schedule.php
2012-11-12 17:46:22 -05:00
a0a9fc71f1
disable unlimited attempts for pushing stats data
2012-11-12 17:44:26 -05:00
350d5dd620
refactored logging setup when mm is setup
2012-11-10 09:24:26 -05:00
6145f9bcad
Merge branch '2.2.x' into devel
2012-11-08 17:28:23 -05:00
f657ee4f20
Merge branch '2.2.x' into 2.2.x-saas
2012-11-08 17:27:51 -05:00
33b2520c14
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-08 17:27:28 -05:00
628e6bed37
CC-4689: Live Stream: The 1st song of a show won't play if there is another show have live stream assigned and finished right before
...
- fixed
2012-11-08 17:26:55 -05:00
eaf0baa6b6
removed useless code
2012-11-07 23:22:25 -05:00
c222ac10f7
typo
2012-11-07 23:21:48 -05:00
55f0462946
removed useless line of code
2012-11-07 23:21:08 -05:00
ed00089a1a
added user level method to get current user of thread
2012-11-07 22:53:39 -05:00
7e5ec6505b
added tests for instance
2012-11-07 18:16:48 -05:00
13f59be21d
typo
2012-11-07 18:16:33 -05:00
9e7b8a6b28
added tests
2012-11-07 17:45:08 -05:00
882a515caa
refactored threads which know the user they belong to
2012-11-07 17:44:55 -05:00
ed7aba83bf
Merge branch 'cc-4661-listener-statistics' into 2.2.x-saas
2012-11-07 17:22:36 -05:00
7300b608cf
Merge branch 'cc-4661-listener-statistics' into devel
...
Conflicts:
python_apps/api_clients/api_client.py
2012-11-07 17:20:12 -05:00
bb8f5e107c
CC-4661: Listener Statistics
...
-ability to gather stats without
admin password
2012-11-07 17:19:47 -05:00
debc5b6081
Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas
2012-11-07 12:19:35 -05:00
073d243007
-airtime couldn't connect to liquidsoap
2012-11-07 12:18:10 -05:00
cd6c305b81
Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas
2012-11-07 12:05:37 -05:00
4200059200
-airtime_version fix
2012-11-07 11:43:49 -05:00
110008e909
added saas shit
2012-11-07 11:29:39 -05:00
af51ddca79
Merge remote-tracking branch 'sf/devel' into mm_refactor_for_saas
2012-11-07 11:29:17 -05:00
b817684972
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/models/StoredFile.php
airtime_mvc/public/js/bootstrap/bootstrap.js
2012-11-07 11:21:36 -05:00
272e428fa7
Merge branch '2.2.x' into 2.2.x-saas
...
Conflicts:
airtime_mvc/application/controllers/PreferenceController.php
airtime_mvc/application/controllers/ScheduleController.php
airtime_mvc/application/forms/EmailServerPreferences.php
airtime_mvc/application/forms/GeneralPreferences.php
airtime_mvc/application/forms/LiveStreamingPreferences.php
airtime_mvc/application/forms/Preferences.php
airtime_mvc/application/forms/SupportSettings.php
airtime_mvc/application/models/Schedule.php
airtime_mvc/application/views/scripts/form/preferences.phtml
airtime_mvc/application/views/scripts/form/preferences_email_server.phtml
airtime_mvc/application/views/scripts/form/preferences_livestream.phtml
airtime_mvc/application/views/scripts/form/support-setting.phtml
airtime_mvc/application/views/scripts/menu.phtml
airtime_mvc/application/views/scripts/schedule/add-
show-form.phtml
2012-11-06 17:23:32 -05:00
b3c9472bcb
cc-4672: added dirty workaround to fix this issue
2012-11-06 16:16:37 -05:00
3f7d8a0c7f
Merge branch '2.2.x' into 2.2.x-saas
2012-11-06 16:11:51 -05:00
1762e418c0
added better logging
2012-11-06 14:57:53 -05:00
b4555e9845
docstring formatting
2012-11-06 13:51:04 -05:00
66138c4baf
removed references to gevent
2012-11-05 16:11:35 -05:00
6392c69e27
Removed unused code
2012-11-05 16:10:59 -05:00
a851d8dd74
docstring format
2012-11-05 16:04:39 -05:00
83d4705bca
removed useless comments
2012-11-05 14:19:37 -05:00
3509cfc212
formatting
2012-11-05 14:03:46 -05:00
c287e11bee
moved setting up unicde into it's own routine
2012-11-05 14:02:55 -05:00
ce313a5b22
docstring formatting
2012-11-05 13:29:10 -05:00
f6ee2afb88
CC-4665: ReplayGain does not work for FLAC files
...
-fixed
2012-11-05 12:03:25 -05:00
fffaf7788a
Merge branch '2.2.x' of dev.sourcefabric.org:airtime into 2.2.x
2012-11-05 11:53:52 -05:00
af7e94a44d
don't break 80 character line limit
2012-11-05 11:53:37 -05:00
d89166e2ff
CC-4665: ReplayGain does not work for FLAC files
...
-fixed
2012-11-05 11:53:20 -05:00
34d0ee5954
CC-4661: Listener Statistics
...
-add mount point names
2012-11-02 18:04:32 -04:00
5bd0fe0300
clean up source file tailing whitespace
2012-11-02 17:51:02 -04:00
6438b54a5f
CC-4661: Listener Statistics
...
-backend part working
2012-11-02 17:50:43 -04:00
dfc3cf9267
removed useless tests
2012-11-02 15:05:08 -04:00
c79b28aa90
Removed gevent from pybundle
2012-11-02 15:03:27 -04:00
899c62d31f
removed gevent from requirements
2012-11-02 15:01:11 -04:00
aec11feba5
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
2012-11-02 14:59:02 -04:00
a1d5037e04
cc-4584: fixxxed
2012-11-02 12:42:24 -04:00
135aadf16b
Merge branch '2.2.x' into devel
...
Conflicts:
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/views/scripts/library/library.phtml
airtime_mvc/public/js/airtime/showbuilder/builder.js
airtime_mvc/public/js/airtime/showbuilder/main_builder.js
2012-11-02 12:28:21 -04:00
e9524c8615
Merge remote-tracking branch 'rudi/cc-4652' into 2.2.x
2012-11-02 11:30:04 -04:00
b746f65304
CC-4601: Do not rewrite metadata for master source and show source streams.
...
- fixed
2012-11-01 17:24:41 -04:00
bf363dcdde
cc-4652: Added code to create the stor/ structure before adding any watched
2012-11-01 15:48:26 -04:00
176f2c45ba
Added information message when media monitor is restarted
2012-11-01 15:42:58 -04:00
c0dc38be62
cc-4652: added logging for when watch fails on startup
2012-11-01 15:16:23 -04:00
7c710fd84e
Removed unused method
2012-10-31 12:48:11 -04:00
11043d2eba
Refactored notify_webstream_data
2012-10-31 12:46:51 -04:00
83211698a4
Added retrying mechanism to ApiRequest
2012-10-31 12:20:00 -04:00
4ef38cbc91
Added retry mechanism
2012-10-31 11:45:22 -04:00
474f5aba48
Added hack for the response type not being set
2012-10-31 11:33:42 -04:00
18d6cd7868
removed commented code
2012-10-31 11:22:04 -04:00
cf27c18df7
Refactored update_replay_gain_values
2012-10-31 11:01:24 -04:00
e3914c429d
refactored get_stream_setting
2012-10-31 10:56:52 -04:00
82a8fe99ae
Refactored docstring
2012-10-31 10:54:02 -04:00
162028ee8a
Unused method removed
2012-10-31 10:52:14 -04:00
24088d63e0
Formatting
2012-10-31 10:48:14 -04:00
8e6f6b8894
formatted comment. added TODO
2012-10-31 10:48:03 -04:00
09c3e3a694
Refactored get_schedule not to suck
2012-10-31 10:47:08 -04:00
9cea6210bb
refactored __get_airtime_version
2012-10-31 10:45:36 -04:00
91ce35ee9a
added todo
2012-10-31 10:43:59 -04:00
75ce5b205d
Fixed setup_media_monitor
2012-10-30 17:48:24 -04:00
3ed762bc38
check_live_stream_auth fixed
2012-10-30 17:47:09 -04:00
4ad1468313
refactored get_shows_to_record
2012-10-30 17:45:22 -04:00
d6f644d53f
Removed unused method
2012-10-30 17:44:27 -04:00
e85996d814
Removed unused method
2012-10-30 17:43:11 -04:00
8f82e2623c
Removed unused method
2012-10-30 17:42:52 -04:00
d482933b1a
notify_liquidsoap_started refactored
2012-10-30 17:41:53 -04:00
1d325949e7
notify_media_item_start_playing uses RequestProvider
2012-10-30 17:40:53 -04:00
3b8181062c
pointless refactoring of stuff that's never used
2012-10-30 17:35:10 -04:00
c7e1902aa2
removed unnecessary json parse
2012-10-30 17:18:06 -04:00
41839ed872
Fixed list_all_db_files to use RequestProvider
2012-10-30 17:17:02 -04:00
de72067e90
Fixed typo calling get_files_without_replay_gain
2012-10-30 17:02:33 -04:00
722a3e6e5d
Fixed register_component to use RequestProvider
2012-10-30 16:50:38 -04:00
81074f9c44
changed notify_source_status to use RequestProvider
2012-10-30 16:42:00 -04:00
f8b5f1dce6
update_file_system_mount is removed because it's not used
2012-10-30 16:31:14 -04:00
81bfbe9e7e
get_boostrap_info and get_files_without_replay_gain_value use RequestProvider
2012-10-30 16:29:37 -04:00
Martin Konecny
Naomi
denise
drigato
James
martin
Martin Konecny
james
Rudi Grinberg