]>
git.parisson.com Git - deefuzzer.git/log
achbed [Mon, 1 Dec 2014 06:37:45 +0000 (00:37 -0600)]
Revised crashed station detection
Added main loop in station to allow remote commands to restart playback after stopping
Added livecreation option to enable.disable watchfolder mode
Added fix for newly created stations not starting
Cleaned up a missed queue unlock instance
Signed-off-by: achbed <github@achbed.org>
achbed [Mon, 1 Dec 2014 00:26:49 +0000 (18:26 -0600)]
Merge remote-tracking branch 'remotes/upstream/dev' into dev
achbed [Mon, 1 Dec 2014 00:26:06 +0000 (18:26 -0600)]
Added new QueueLogger class (logging from a queue so we can do thread-safe logging)
Moved core and station to new common log functions (_info and _err) using new QueueLogger
Core now attempts to restart stations that stop
Core now detects new folders on the fly instead of only at start time (stationfolder option)
Station.py has a lot of changes to utilize the common blocking queue only when needed rather than at every step (may increase performance with many stations)
TODO:
Detect proper vs unexpected shutdown of stations and restart only unexpected ones
Make new folder detection for stationfolder an option
Guillaume Pellerin [Sun, 30 Nov 2014 22:23:59 +0000 (23:23 +0100)]
Merge pull request #35 from achbed/dev
Stability fixes
achbed [Sat, 29 Nov 2014 04:47:34 +0000 (22:47 -0600)]
Added init.d and default config scripts to scripts folder (sets up deefuzzer as a system-level daemon)
Signed-off-by: achbed <github@achbed.org>
achbed [Sat, 29 Nov 2014 04:27:55 +0000 (22:27 -0600)]
Removed extraneous "pass"es
Standardized error and info logging within station class
Fixed typo on truthy values
achbed [Fri, 28 Nov 2014 20:27:22 +0000 (14:27 -0600)]
Refactored main icecast loop for readability
Added additional error handling in main icecast loop
Added additional error handling to icecast chunk send loop
Signed-off-by: achbed <github@achbed.org>
Guillaume Pellerin [Sun, 23 Nov 2014 20:39:16 +0000 (21:39 +0100)]
Merge pull request #34 from achbed/dev
New file name and path options for feeds
achbed [Sat, 22 Nov 2014 04:57:24 +0000 (22:57 -0600)]
Added new station.feeds.showfilename option that includes the media file name in the feed
Added new station.feeds.showfilepath option that includes the server path to the media file in the feed
Signed-off-by: achbed <github@achbed.org>
Guillaume Pellerin [Fri, 21 Nov 2014 09:13:00 +0000 (10:13 +0100)]
Merge pull request #33 from achbed/dev
Core Changes round 3
achbed [Fri, 21 Nov 2014 06:04:59 +0000 (00:04 -0600)]
Added some logging when a station fails to initialize
Signed-off-by: achbed <github@achbed.org>
achbed [Fri, 21 Nov 2014 05:42:35 +0000 (23:42 -0600)]
Fixed a few issues with setting up logging
Signed-off-by: achbed <github@achbed.org>
achbed [Fri, 21 Nov 2014 05:41:10 +0000 (23:41 -0600)]
Ensure that integer parameters are treated properly
Removed double-set options
Signed-off-by: achbed <github@achbed.org>
achbed [Fri, 21 Nov 2014 05:33:47 +0000 (23:33 -0600)]
Reverted a lot of changes
Signed-off-by: achbed <github@achbed.org>
achbed [Fri, 21 Nov 2014 04:36:52 +0000 (22:36 -0600)]
Added documentation
Revised init handling of preferences for consistency
Fixed issue where some boolean flags (ie, modes) were not being handled properly
Signed-off-by: achbed <github@achbed.org>
achbed [Thu, 20 Nov 2014 21:56:33 +0000 (15:56 -0600)]
Merge remote-tracking branch 'remotes/upstream/dev' into dev
Guillaume Pellerin [Thu, 20 Nov 2014 09:12:54 +0000 (10:12 +0100)]
Merge pull request #31 from achbed/dev-stationfolder
Three new features, and a bug fix in a pear tree
achbed [Thu, 20 Nov 2014 06:15:07 +0000 (00:15 -0600)]
Merge branch 'dev-stationfolder' into dev
Conflicts:
deefuzzer/core.py
deefuzzer/tools/utils.py
achbed [Thu, 20 Nov 2014 06:00:14 +0000 (00:00 -0600)]
Typo
Signed-off-by: achbed <github@achbed.org>
achbed [Thu, 20 Nov 2014 05:58:38 +0000 (23:58 -0600)]
Core fix for inconsistent list object for station preferences
Added stationdefaults preference (apply default settings to all stations)
Added stationfolder preference (generate stations automagically from a folder structure)
Added stationconfig preference (load other preference files as stations)
Moved get_conf_dict to utils.py
Added documentation for the stationdefaults preference
Added documentation for the stationfolder and stationconfig preferences (deefuzzer_doc.xml only)
Signed-off-by: achbed <github@achbed.org>
achbed [Thu, 20 Nov 2014 04:52:32 +0000 (22:52 -0600)]
Added stationdefaults parameter (provides a mechanism to give default values for all stations)
New merge_defaults function in utils.py - combines two dict objects recursively
Signed-off-by: achbed <github@achbed.org>
Guillaume Pellerin [Wed, 19 Nov 2014 22:43:05 +0000 (23:43 +0100)]
Merge pull request #28 from achbed/dev-dsw
JSON Feed Support
achbed [Wed, 19 Nov 2014 22:16:05 +0000 (16:16 -0600)]
Merge branch 'dev-jsonfeed' into dev-dsw
Conflicts:
deefuzzer/station.py
Guillaume Pellerin [Wed, 19 Nov 2014 22:06:58 +0000 (23:06 +0100)]
Merge pull request #26 from achbed/dev
Add new station.server.appendtype option
achbed [Wed, 19 Nov 2014 21:59:38 +0000 (15:59 -0600)]
Fixed documented example with renamed feeds tag
Signed-off-by: achbed <github@achbed.org>
achbed [Wed, 19 Nov 2014 21:57:41 +0000 (15:57 -0600)]
Updated example config files with new/renamed options
Signed-off-by: achbed <github@achbed.org>
achbed [Wed, 19 Nov 2014 21:46:32 +0000 (15:46 -0600)]
Missing json import
Moved handling of rss_mode to within the update_rss function
Renamed rss_* variables to feeds_*
Renamed feed_* variables to feeds_*
Renamed update_rss to update_feeds
Fixed feeds_mode to have a default of 1 (enabled)
Fixed issue where playlist feeds were not created at start time
Added ability to disable playlist feed output
Added <playlist> tag to feeds options (1=output,0=suppress,default=1)
Signed-off-by: achbed <github@achbed.org>
achbed [Wed, 19 Nov 2014 20:51:18 +0000 (14:51 -0600)]
Merge branch 'dev-jsonfeed' into dev-dsw
Conflicts:
deefuzzer/station.py
achbed [Wed, 19 Nov 2014 20:48:19 +0000 (14:48 -0600)]
Added ability to export json data as well as RSS feeds
Added ability to selectively enable/disable json or RSS output
Renamed <rss> tag to <feed>
RSS reads from <rss> tag if no <feed> tag is present (for backwards compatibility)
Signed-off-by: achbed <github@achbed.org>
achbed [Wed, 19 Nov 2014 17:03:04 +0000 (11:03 -0600)]
tab to space (for indent issues)
Signed-off-by: achbed <github@achbed.org>
achbed [Wed, 19 Nov 2014 17:00:24 +0000 (11:00 -0600)]
Added examples for appendtype
Signed-off-by: achbed <github@achbed.org>
achbed [Wed, 19 Nov 2014 09:18:33 +0000 (03:18 -0600)]
Add option to append stream type to the mount path for icecast streams. Default is enabled (matches current behavior)
Signed-off-by: achbed <github@achbed.org>
Guillaume Pellerin [Wed, 13 Aug 2014 22:18:22 +0000 (00:18 +0200)]
Merge pull request #23 from ChoiZ/dev
Remove unnecessary variables
François LASSERRE [Wed, 13 Aug 2014 19:52:27 +0000 (21:52 +0200)]
Remove unnecessary variables
Guillaume Pellerin [Thu, 7 Aug 2014 10:00:11 +0000 (12:00 +0200)]
Merge branch 'dev' of github.com:yomguy/DeeFuzzer into dev
Guillaume Pellerin [Thu, 7 Aug 2014 09:59:38 +0000 (11:59 +0200)]
cleanup Manifest (fix #19)
Guillaume Pellerin [Thu, 7 Aug 2014 00:12:16 +0000 (02:12 +0200)]
Merge pull request #17 from ChoiZ/dev
Add 0.6.6 in Readme
François LASSERRE [Wed, 6 Aug 2014 17:59:03 +0000 (19:59 +0200)]
Add 0.6.6
Fix "internet" to "Internet"
Remove <space> between ":", "!"
Add Uppercase
Guillaume Pellerin [Wed, 6 Aug 2014 17:57:36 +0000 (19:57 +0200)]
Merge branch 'master' into dev
Guillaume Pellerin [Wed, 6 Aug 2014 17:57:06 +0000 (19:57 +0200)]
Merge branch 'dev' of github.com:yomguy/DeeFuzzer into dev
Guillaume Pellerin [Wed, 6 Aug 2014 17:56:42 +0000 (19:56 +0200)]
begin station_dir parameter
Guillaume Pellerin [Wed, 6 Aug 2014 14:43:59 +0000 (16:43 +0200)]
Merge pull request #16 from ChoiZ/dev
Minor changes
Guillaume Pellerin [Wed, 6 Aug 2014 14:40:51 +0000 (16:40 +0200)]
Merge pull request #15 from ChoiZ/patch-2
Update README.rst
Guillaume Pellerin [Wed, 6 Aug 2014 14:40:30 +0000 (16:40 +0200)]
Merge pull request #14 from ChoiZ/patch-1
Update README.rst
François LASSERRE [Wed, 6 Aug 2014 14:15:14 +0000 (16:15 +0200)]
Delete CHANGELOG
Remove old CHANGELOG file.
François LASSERRE [Wed, 6 Aug 2014 09:44:52 +0000 (11:44 +0200)]
Merge branch 'ogg_quality' into dev
François LASSERRE [Wed, 6 Aug 2014 09:44:28 +0000 (11:44 +0200)]
Remove 'ogg_quality' in mp3 stream
François LASSERRE [Wed, 6 Aug 2014 09:41:09 +0000 (11:41 +0200)]
Merge branch 'stream_description_url' into dev
François LASSERRE [Wed, 6 Aug 2014 09:39:54 +0000 (11:39 +0200)]
Remove channel url in station name
François LASSERRE [Wed, 6 Aug 2014 09:38:49 +0000 (11:38 +0200)]
Merge branch 'metadatas_separation' into dev
François LASSERRE [Wed, 6 Aug 2014 09:34:44 +0000 (11:34 +0200)]
Update song separation mark
Replace "artist : title" by "artist - title"
Guillaume Pellerin [Tue, 5 Aug 2014 18:16:05 +0000 (20:16 +0200)]
fix version
Guillaume Pellerin [Tue, 5 Aug 2014 18:15:22 +0000 (20:15 +0200)]
Merge branch 'master' into dev
Guillaume Pellerin [Tue, 5 Aug 2014 18:15:06 +0000 (20:15 +0200)]
Merge branch 'dev' of github.com:yomguy/DeeFuzzer into dev
Guillaume Pellerin [Tue, 5 Aug 2014 18:14:36 +0000 (20:14 +0200)]
fix non-absolute log and m3u paths
François LASSERRE [Tue, 5 Aug 2014 17:19:06 +0000 (19:19 +0200)]
Update README.rst
Fix github link for DeeFuzzer logo :)
François LASSERRE [Tue, 5 Aug 2014 16:50:30 +0000 (18:50 +0200)]
Update README.rst
Fix github link for DeeFuzzer logo :)
Guillaume Pellerin [Tue, 5 Aug 2014 16:05:12 +0000 (18:05 +0200)]
Merge pull request #12 from ChoiZ/patch-1
Update README.rst
Guillaume Pellerin [Tue, 5 Aug 2014 16:04:15 +0000 (18:04 +0200)]
Merge pull request #13 from ChoiZ/dev
Update configuration files
François LASSERRE [Mon, 4 Aug 2014 19:22:33 +0000 (21:22 +0200)]
Remove trailing whitespaces.
Reorder each files.
François LASSERRE [Sat, 2 Aug 2014 15:13:43 +0000 (17:13 +0200)]
Update README.rst
Fix examples URL.
Guillaume Pellerin [Sun, 20 Jul 2014 12:19:47 +0000 (14:19 +0200)]
Merge branch 'dev'
Conflicts:
deefuzzer/station.py
Guillaume Pellerin [Sun, 20 Jul 2014 12:19:03 +0000 (14:19 +0200)]
fix id
Guillaume Pellerin [Sun, 20 Jul 2014 12:13:25 +0000 (14:13 +0200)]
fix no rss
Guillaume Pellerin [Sun, 20 Jul 2014 12:01:43 +0000 (14:01 +0200)]
fix
Guillaume Pellerin [Sun, 20 Jul 2014 12:00:02 +0000 (14:00 +0200)]
fix first playlist build
Guillaume Pellerin [Sun, 20 Jul 2014 11:37:37 +0000 (13:37 +0200)]
just twitter
Guillaume Pellerin [Sun, 20 Jul 2014 11:37:37 +0000 (13:37 +0200)]
just twitter
Guillaume Pellerin [Sun, 20 Jul 2014 11:34:00 +0000 (13:34 +0200)]
No twitter on first playlist build
Guillaume Pellerin [Sun, 20 Jul 2014 11:34:00 +0000 (13:34 +0200)]
No twitter on first playlist build
Guillaume Pellerin [Sat, 5 Jul 2014 18:45:12 +0000 (20:45 +0200)]
allow empty field in rss.media_url (fix #8)
Guillaume Pellerin [Mon, 26 May 2014 09:39:19 +0000 (11:39 +0200)]
No signal for pycurl streamer
Guillaume Pellerin [Mon, 26 May 2014 09:38:48 +0000 (11:38 +0200)]
Merge branch 'dev'
Guillaume Pellerin [Mon, 26 May 2014 09:38:39 +0000 (11:38 +0200)]
cleanup
Guillaume Pellerin [Mon, 26 May 2014 01:33:08 +0000 (03:33 +0200)]
add a little converter from XML to YAML
Guillaume Pellerin [Sat, 24 May 2014 08:55:43 +0000 (10:55 +0200)]
update deps
Guillaume Pellerin [Fri, 23 May 2014 15:16:12 +0000 (17:16 +0200)]
add deps for travis
Guillaume Pellerin [Fri, 23 May 2014 14:45:46 +0000 (16:45 +0200)]
Add deps for travis
Guillaume Pellerin [Fri, 23 May 2014 14:08:03 +0000 (16:08 +0200)]
Add JSON conf parsing, add any conf parameter as an attribute to the DeeFuzzer class (fix #2)
Guillaume Pellerin [Mon, 31 Mar 2014 10:22:41 +0000 (12:22 +0200)]
cleanup, better exception handling, add partial WebM support, add a curl based streaming object
Guillaume Pellerin [Fri, 6 Dec 2013 08:36:22 +0000 (09:36 +0100)]
add travis tests
Guillaume Pellerin [Fri, 6 Dec 2013 08:29:31 +0000 (09:29 +0100)]
back to 0.6.5
Guillaume Pellerin [Tue, 3 Dec 2013 13:46:42 +0000 (05:46 -0800)]
Merge pull request #5 from ChoiZ/master
Fix readme
Guillaume Pellerin [Tue, 3 Dec 2013 12:56:05 +0000 (13:56 +0100)]
update deps
Guillaume Pellerin [Tue, 3 Dec 2013 12:56:05 +0000 (13:56 +0100)]
update deps
François LASSERRE [Tue, 3 Dec 2013 11:25:45 +0000 (12:25 +0100)]
Fix tar.gz and folder name "DeeFuzzer" instead of "deefuzzer"
Fix word documented
Remove trailing whitespaces
Guillaume Pellerin [Mon, 2 Dec 2013 23:36:47 +0000 (00:36 +0100)]
cleanup
Guillaume Pellerin [Mon, 2 Dec 2013 23:32:55 +0000 (00:32 +0100)]
goto 0.6.6
Guillaume Pellerin [Mon, 2 Dec 2013 23:31:39 +0000 (00:31 +0100)]
add yaml doc
Guillaume Pellerin [Mon, 2 Dec 2013 23:27:58 +0000 (00:27 +0100)]
cleanup
Guillaume Pellerin [Mon, 2 Dec 2013 23:13:18 +0000 (00:13 +0100)]
Merge branch 'dev' of git+ssh://vcs.parisson.com/var/git/deefuzzer into dev
Guillaume Pellerin [Thu, 19 Sep 2013 12:03:09 +0000 (14:03 +0200)]
icecast server type by default
Guillaume Pellerin [Mon, 2 Dec 2013 23:09:13 +0000 (00:09 +0100)]
bugfix
Guillaume Pellerin [Mon, 2 Dec 2013 22:58:17 +0000 (23:58 +0100)]
add python-dev
Guillaume Pellerin [Mon, 2 Dec 2013 22:50:48 +0000 (23:50 +0100)]
update doc
Guillaume Pellerin [Mon, 2 Dec 2013 22:43:34 +0000 (23:43 +0100)]
remove tinyurl
Guillaume Pellerin [Mon, 2 Dec 2013 22:35:50 +0000 (23:35 +0100)]
fix no init
Guillaume Pellerin [Mon, 2 Dec 2013 22:30:03 +0000 (23:30 +0100)]
fix manifest
Guillaume Pellerin [Mon, 2 Dec 2013 22:17:14 +0000 (23:17 +0100)]
update news
Guillaume Pellerin [Fri, 18 Oct 2013 22:39:28 +0000 (00:39 +0200)]
fix tools import