Martin Konecny
|
4ebcb1b1f9
|
Merge branch '2.1.x' into devel
Conflicts:
airtime_mvc/application/controllers/ApiController.php
airtime_mvc/application/controllers/LibraryController.php
airtime_mvc/application/controllers/PlaylistController.php
airtime_mvc/application/models/Playlist.php
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
python_apps/media-monitor/airtimefilemonitor/airtimemetadata.py
|
2012-07-16 14:31:03 -04:00 |
Martin Konecny
|
f0f033b4fb
|
CC-430: Audio normalization (Replaygain Support)
|
2012-07-12 17:58:29 -04:00 |
Martin Konecny
|
62287a2313
|
-Remove useless api_client interface
|
2012-07-12 16:51:11 -04:00 |
Martin Konecny
|
b782b9a9b6
|
CC-4099: More stricter checking on ogg file types
-fixed
|
2012-07-11 18:14:03 -04:00 |
Martin Konecny
|
fc1b69e1d1
|
CC-4092: Not checking for return type "None" on some function calls in media-monitor
-more fixes
|
2012-07-11 17:09:17 -04:00 |
Martin Konecny
|
ba5a749073
|
CC-4092: Not checking for return type "None" on some function calls in media-monitor
-more fixes
|
2012-07-11 16:48:46 -04:00 |
Martin Konecny
|
bed2a0731b
|
fix potential exception
|
2012-07-11 10:39:23 -04:00 |
Martin Konecny
|
2e5b1d9ca8
|
CC-4092: Not checking for return type "None" on some function calls in media-monitor
-fixed
|
2012-07-10 10:48:44 -04:00 |
Martin Konecny
|
aecee0574d
|
Random commits gathered and put into one
-since we had an accidental merge between devel and 2.1.x, I'm rounding
up these changes that need to be in 2.1.x and putting them here.
|
2012-07-09 18:58:22 -04:00 |
Rudi Grinberg
|
32c3e877a5
|
fix typo
|
2012-07-09 16:30:54 -04:00 |
Martin Konecny
|
dec68649c1
|
code cleanup
-changed module name to correct naming convention
-remove some unused imports
|
2012-07-06 10:20:44 -04:00 |
Martin Konecny
|
24349e64d8
|
CC-430: Audio normalization (Replaygain Support)
-some minor fixes for default value (should be 0 dB not 1dB)
|
2012-07-05 23:30:53 -04:00 |
Martin Konecny
|
ce698d4123
|
CC-430: Audio normalization (Replaygain Support)
-Added support on server side
|
2012-07-05 22:37:40 -04:00 |
Martin Konecny
|
70a0dce26e
|
Merge branch 'devel' of dev.sourcefabric.org:airtime into devel
Conflicts:
python_apps/media-monitor/airtimefilemonitor/airtimemediamonitorbootstrap.py
python_apps/media-monitor/airtimefilemonitor/mediamonitorcommon.py
|
2012-07-05 21:57:12 -04:00 |
Martin Konecny
|
a687e48d80
|
CC-430: Audio normalization (Replaygain Support)
-Added support on media-monitor's side
|
2012-07-05 21:54:44 -04:00 |
Rudi Grinberg
|
6fe48547d9
|
Make sure md['MDATA_KEY_FILEPATH'] is always normalized
|
2012-07-05 16:46:25 -04:00 |
Rudi Grinberg
|
e67be25b85
|
Fixed typo from copy pasting
|
2012-07-05 16:32:54 -04:00 |
Rudi Grinberg
|
38dbc28e1c
|
get rid of pypo permissions since it now runs as root
|
2012-07-05 16:32:54 -04:00 |
Rudi Grinberg
|
5e9302d912
|
Removed unnecessary whitespace
|
2012-07-05 16:32:54 -04:00 |
Rudi Grinberg
|
7f4e6f98f5
|
fixed is_audio_file to handle extensionless files. made sure is_user_readable closes opened filehandle
|
2012-07-05 16:32:54 -04:00 |
Rudi Grinberg
|
1916ea8b0e
|
Put duplicate code into mediamonitorcommon. Removed unnecessary blank lines
|
2012-07-05 16:32:54 -04:00 |
Rudi Grinberg
|
6c1af8a96e
|
Changed uses of 'find' to respect supported_file_formats list
|
2012-07-05 16:32:54 -04:00 |
Rudi Grinberg
|
3dfb35d2d1
|
Fixed typo. Made supported_file_formats static because they should be same for all instances
|
2012-07-05 16:32:54 -04:00 |
Rudi Grinberg
|
2317a3eba8
|
removed more code duplication
|
2012-07-05 16:32:54 -04:00 |
Rudi Grinberg
|
5f1b2d23bf
|
fixed code duplication and replaced manual path concatenation with os.path.join
|
2012-07-05 16:32:54 -04:00 |
Rudi Grinberg
|
d73197b89a
|
Added traceback log to section where a general exception can be caught
|
2012-07-04 16:40:35 -04:00 |
Rudi Grinberg
|
f8660ed89d
|
Fixed bug where exception was thrown and logged when metadata was missing(bitrate, samplerate)
|
2012-07-04 16:40:35 -04:00 |
Rudi Grinberg
|
4064512c83
|
A couple of stylistic changes
|
2012-07-04 16:40:35 -04:00 |
Rudi Grinberg
|
96da87bccb
|
removed a few line characters
|
2012-07-04 16:40:35 -04:00 |
denise
|
bc93119adc
|
Merge branch '2.1.x' into devel
|
2012-07-04 09:46:30 -04:00 |
Martin Konecny
|
619f17b2f9
|
fix indentation
|
2012-07-03 16:43:24 -04:00 |
denise
|
d02607ed94
|
CC-3561: Add button to automatically rescan watched folders.
-done
|
2012-06-15 12:16:19 -04:00 |
Martin Konecny
|
22453f3820
|
CC-3968: Cannot preview file as * .MP3
-fixed
|
2012-06-12 11:31:10 -04:00 |
James
|
841dd298d5
|
CC-3946: Files with upper case "MP3" extension not being imported
- fixed
|
2012-06-08 15:07:14 -04:00 |
James
|
0ca45e343b
|
CC-3878: Recorded media file's track number is changed after restarting media-monitor
- fixed
|
2012-06-06 14:18:54 -04:00 |
denise
|
c521e3c545
|
CC-3849: PlaylistLibrary->Edit Metadata: The deletion of metadata entries has no effect after saving
-fixed
|
2012-06-05 11:20:00 -04:00 |
Martin Konecny
|
b6446442ba
|
CC-3917: record_date field in recorded shows causing problem
-fixed
|
2012-06-04 11:43:41 -04:00 |
Martin Konecny
|
b9c6eab39c
|
make sure we explicitly need to tell Airtime services to start
|
2012-05-28 17:42:48 -04:00 |
Martin Konecny
|
910f8e8627
|
ensure dirs end with "/"
|
2012-05-25 16:19:39 -04:00 |
Martin Konecny
|
b677d2985b
|
-remove useless to utf8 conversions
|
2012-05-16 15:38:26 -04:00 |
Martin Konecny
|
191de74bae
|
CC-3811: Error found in Media Monitor and Apache's log about Media Monitor try to store recorded file
|
2012-05-15 17:36:33 -04:00 |
Martin Konecny
|
4a6a31c5a4
|
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-indent error
|
2012-05-14 19:55:38 -04:00 |
Martin Konecny
|
cadf0acac7
|
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-fix utf-8 check
|
2012-05-14 19:53:07 -04:00 |
Martin Konecny
|
c397a6f797
|
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-move utf-8 locale check to bash
|
2012-05-14 19:46:53 -04:00 |
Martin Konecny
|
c1d33e9f72
|
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-syntax errors
|
2012-05-14 19:31:50 -04:00 |
Martin Konecny
|
b79f02ab88
|
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
|
2012-05-14 19:19:42 -04:00 |
Martin Konecny
|
92931f662f
|
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-override LC_ALL=POSIX that happens on system bootup
|
2012-05-14 18:35:20 -04:00 |
Martin Konecny
|
c24a8a2308
|
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-override LC_ALL=POSIX that happens on system bootup
|
2012-05-14 17:50:08 -04:00 |
Martin Konecny
|
08c20cff10
|
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-add UTF-8 header everywhere...
|
2012-05-14 16:09:49 -04:00 |
Martin Konecny
|
a734540e5b
|
CC-3791: Media Monitor crash when there are media files with non-ascii name in watched folder
-fixed with hack...
|
2012-05-10 14:36:59 -04:00 |