Commit Graph

532 Commits

Author SHA1 Message Date
Naomi fc8c964d43 Merge branch '2.5.x' into 2.6.x
Conflicts:
	airtime_mvc/application/configs/conf.php
	airtime_mvc/application/controllers/ApiController.php
	airtime_mvc/application/models/Scheduler.php
	airtime_mvc/application/services/HistoryService.php
	airtime_mvc/build/build.properties
2014-02-25 11:36:55 -05:00
Naomi 062d8ae9d6 CC-5450 : Refactor Media Management (Classes/DB) in Airtime
removing all old media access from ApiController, using the new tables.
2014-02-20 16:10:08 -05:00
Albert Santoni 8a6ac21e8c CC-5679: Media Monitor: Uploading folder with tracks will erase organize folder itself
* Fixed problem where the "organize" folder would get deleted if you
  copied a directory into it. Would break FTP uploads on Pro.
2014-01-31 13:20:10 -05:00
Albert Santoni 2525c0dbd6 Fixed a race condition in media-monitor
* Prevent exception if files are copied in very quickly
2014-01-30 15:58:52 -05:00
Daniel James 577bbf14b6 Remove swear words from source code 2013-09-23 16:16:51 +01:00
denise 9cbdd06af2 Removed ugly comment 2013-08-12 16:05:44 -04:00
denise 6501d563be CC-5276: Adding watched folder throws exception sometimes
Fixed by only converting length format if it is not already in the correct format
2013-08-12 16:01:55 -04:00
Martin Konecny f7a6fec5eb CC-5195: Media Folder: Update media folder will block media uploader
-fixed
2013-06-06 12:54:48 -04:00
Martin Konecny f61eeaf18c CC-5195:
Media Folder: Update media folder will block media uploader

-fixed
2013-06-06 12:44:20 -04:00
Martin Konecny 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
Martin Konecny 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
Martin Konecny ba3703b556 Revert "CC-5126:"
This reverts commit a2b500729c.
2013-05-15 13:10:56 -04:00
Martin Konecny 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
Martin Konecny 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
Martin Konecny d06b2f3f94 CC-5116:
Please add opus into the file name filter

-fixed
2013-05-08 17:06:50 -04:00
Martin Konecny 655c1eb5a9 CC-5043:
Invalid literal for float error from mutagen
2013-04-26 11:37:46 -04:00
Martin Konecny 80bd57ce4e CC-5050: Tracks with a very high track count cannot be saved into database
-fixed
2013-04-22 17:54:25 -04:00
Martin Konecny 7237d48ef6 fix missing import 2013-03-26 15:01:53 -04:00
Martin Konecny c2fb811100 CC-5012:
remove all shell=True commands for subprocess calls

-fixed
2013-03-07 18:33:55 -05:00
Martin Konecny 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
Martin Konecny 259f70bc21 CC-4915: Media-Monitor cannot handle rabbitmq restart event
-fixed
2013-03-01 16:05:55 -05:00
Martin Konecny 2f33e99ff5 CC-4915: Media-Monitor cannot handle rabbitmq restart event
-fixed
2013-03-01 15:52:19 -05:00
Martin Konecny 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
Martin Konecny e35416b1e8 undo - make sure path names are quoted when passing to lsof 2013-02-25 17:43:02 -05:00
Martin Konecny deb50ea769 make sure path names are quoted when passing to lsof 2013-02-25 16:44:28 -05:00
Martin Konecny 57183b8ac8 prevent creation of Zombie processes when running lsof 2013-02-22 12:03:39 -05:00
Martin Konecny 8f53871ddc CC-4970: Process return codes aren't "reaped" after exiting - Zombie processes are created.
-fixed
2013-02-20 14:40:16 -05:00
Martin Konecny 331386f74f CC-4910: Need to properly handle non-200 http status codes in api client
-fixed
2013-02-04 16:05:58 -05:00
Martin Konecny c6ee5bfe58 prepare baby mm for saas 2013-01-22 13:02:45 -05:00
denise bbedce2951 Changed default base directory in airtime.conf and api_client.cfg 2013-01-15 13:47:35 -05:00
Martin Konecny 5df867d142 remove whitespace 2013-01-03 15:05:31 -05:00
James f5b6d85406 CC-3018: Automatically strip out silence from audio tracks
- adding logging
2013-01-03 14:30:19 -05:00
James a1837366be Merge branch 'cc-3018-silence-detection' into devel 2013-01-03 14:08:21 -05:00
James f936f510c5 CC-3018: Automatically strip out silence from audio tracks
- adding try/catch
2013-01-03 14:07:34 -05:00
James b8f80866cf CC-3018: Automatically strip out silence from audio tracks
- done
2013-01-03 14:02:06 -05:00
Martin Konecny f2322e4f76 -disable liquidsoap playability test 2013-01-03 11:48:00 -05:00
Martin Konecny 77da642996 -fix missing import 2013-01-02 17:49:06 -05:00
Martin Konecny 2589b133d9 CC-4343: Unflushed events loop in media monitor
-fixed
2013-01-02 16:58:24 -05:00
Martin Konecny 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
Martin Konecny 735ad30483 CC-4726: Sometimes mm doesn't start after a fresh install
-fixed
2012-12-03 16:56:11 -05:00
Martin Konecny e3761bd8d6 -make sure lsof works for files with spaces 2012-12-03 16:33:24 -05:00
martin 735640d40b Merge branch 'lsof_quote_fix' of https://github.com/rgrinberg/Airtime into devel 2012-11-23 16:18:23 -05:00
James da6013b523 CC-4717: Lintian warnings from devel branch
- fixed
2012-11-22 15:14:55 -05:00
Rudi Grinberg 1f5a5fd294 typo 2012-11-21 17:24:31 -05:00
Rudi Grinberg 0e91188939 made a unique toucher file 2012-11-21 17:22:32 -05:00
Rudi Grinberg 8c97995c2f Added vulnerability where strings would not be escaped when pass to shell command 2012-11-21 12:55:57 -05:00
Rudi Grinberg ac6a5a11bf docstring fixes 2012-11-20 16:41:45 -05:00
Rudi Grinberg 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
Rudi Grinberg 95e757a52c removed file mediator because it seems to be useless and incompatible with saas 2012-11-20 14:44:24 -05:00
Rudi Grinberg 58d888a59f Small refactoring to let user be assignable from any class that inherits from HasUser 2012-11-20 14:43:48 -05:00