]> git.parisson.com Git - deefuzzer.git/log
deefuzzer.git
10 years agoMerge pull request #46 from achbed/dev
Guillaume Pellerin [Sun, 18 Jan 2015 09:56:57 +0000 (10:56 +0100)]
Merge pull request #46 from achbed/dev

Fixed logic flaw with retry counts

10 years agoFixed logic flaw with retry counts (negative maxretry value would never retry instead...
achbed [Fri, 16 Jan 2015 22:48:37 +0000 (16:48 -0600)]
Fixed logic flaw with retry counts (negative maxretry value would never retry instead of always retry)

Signed-off-by: achbed <github@achbed.org>
10 years agoMerge pull request #45 from achbed/dev
Guillaume Pellerin [Mon, 12 Jan 2015 12:43:25 +0000 (13:43 +0100)]
Merge pull request #45 from achbed/dev

Move thread execution detection into create loop (as we can't restart dead threads)
Altered create loop to run all the time (instead of only at station creation)
Fixed issue where streams would not be closed if an error occurred in playlist advancement
Fixed issue where saved playlist position could result in an index overflow
Added maxretry value (determines how many times to attempt a station thread restart)
Fixed minor documentation things

10 years agoMerge remote-tracking branch 'remotes/upstream/dev' into dev
achbed [Sun, 11 Jan 2015 23:00:39 +0000 (17:00 -0600)]
Merge remote-tracking branch 'remotes/upstream/dev' into dev

10 years agoMove thread execution detection into create loop (as we can't restart dead threads)
achbed [Sun, 11 Jan 2015 22:58:34 +0000 (16:58 -0600)]
Move thread execution detection into create loop (as we can't restart dead threads)
Altered create loop to run all the time (instead of only at station creation)
Fixed issue where streams would not be closed if an error occurred in playlist advancement
Fixed issue where saved playlist position could result in an index overflow
Added maxretry value (determines how many times to attempt a station thread restart)
Fixed minor documentation things

Signed-off-by: achbed <github@achbed.org>
10 years agoMerge branch 'dev' of github.com:yomguy/DeeFuzzer into dev
Guillaume Pellerin [Mon, 5 Jan 2015 15:47:49 +0000 (16:47 +0100)]
Merge branch 'dev' of github.com:yomguy/DeeFuzzer into dev

10 years agocleanup
Guillaume Pellerin [Mon, 5 Jan 2015 15:47:40 +0000 (16:47 +0100)]
cleanup

10 years agoMerge pull request #43 from achbed/dev
Guillaume Pellerin [Sun, 14 Dec 2014 21:27:49 +0000 (22:27 +0100)]
Merge pull request #43 from achbed/dev

Important log crashing fix, new ignore error feature

10 years agoTypo
achbed [Fri, 12 Dec 2014 23:30:16 +0000 (17:30 -0600)]
Typo

Signed-off-by: achbed <github@achbed.org>
10 years agoUpdated init.d scripts for cleaner stop/start
achbed [Fri, 12 Dec 2014 22:28:53 +0000 (16:28 -0600)]
Updated init.d scripts for cleaner stop/start

Signed-off-by: achbed <github@achbed.org>
10 years agoBUG: a few logging functions were called incorrectly in station.py
achbed [Fri, 12 Dec 2014 22:19:03 +0000 (16:19 -0600)]
BUG: a few logging functions were called incorrectly in station.py
FEATURE: Added option (ignoreerrors) to log and continue when an error occurs during station setup

10 years agoGoto 0.7
Guillaume Pellerin [Mon, 8 Dec 2014 15:05:31 +0000 (16:05 +0100)]
Goto 0.7
Partially fixes #20 (bad chars on the icecast side...)

10 years agoSlow playback read by default
Guillaume Pellerin [Sun, 7 Dec 2014 10:53:07 +0000 (11:53 +0100)]
Slow playback read by default

10 years agoMerge pull request #39 from achbed/dev
Guillaume Pellerin [Thu, 4 Dec 2014 22:43:33 +0000 (23:43 +0100)]
Merge pull request #39 from achbed/dev

more stability/recoverability changes

10 years agoSplit try block for exporting the different feed types (so failure on one doesn't...
achbed [Wed, 3 Dec 2014 15:16:09 +0000 (09:16 -0600)]
Split try block for exporting the different feed types (so failure on one doesn't block the other)
Converted the Producer to put a static True value on the queue instead (prevent possible overflow)
Add jingles:frequency option
Now resets counter to prevent eventual overflow
Add saving of status file to record current position
Add reading of status file on station init to restart where it left off
Reset the counter when incremented to prevent overflows
When a new playlist is detected (ie, songs added/removed) playback attempts to keep going instead of restarting

10 years agoMerge pull request #38 from achbed/dev
Guillaume Pellerin [Mon, 1 Dec 2014 08:44:48 +0000 (09:44 +0100)]
Merge pull request #38 from achbed/dev

Better (try 3).

10 years agoAdded code to search for "COUNTRY" custom tag in MP3 files
achbed [Mon, 1 Dec 2014 08:01:49 +0000 (02:01 -0600)]
Added code to search for "COUNTRY" custom tag in MP3 files

Signed-off-by: achbed <github@achbed.org>
10 years agoFix for crashing after first track if played
achbed [Mon, 1 Dec 2014 06:48:53 +0000 (00:48 -0600)]
Fix for crashing after first track if played

Signed-off-by: achbed <github@achbed.org>
10 years agoRevised crashed station detection
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>
10 years agoMerge remote-tracking branch 'remotes/upstream/dev' into dev
achbed [Mon, 1 Dec 2014 00:26:49 +0000 (18:26 -0600)]
Merge remote-tracking branch 'remotes/upstream/dev' into dev

10 years agoAdded new QueueLogger class (logging from a queue so we can do thread-safe logging)
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

10 years agoMerge pull request #35 from achbed/dev
Guillaume Pellerin [Sun, 30 Nov 2014 22:23:59 +0000 (23:23 +0100)]
Merge pull request #35 from achbed/dev

Stability fixes

10 years agoAdded init.d and default config scripts to scripts folder (sets up deefuzzer as a...
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>
10 years agoRemoved extraneous "pass"es
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

10 years agoRefactored main icecast loop for readability
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>
10 years agoMerge pull request #34 from achbed/dev
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

10 years agoAdded new station.feeds.showfilename option that includes the media file name in...
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>
10 years agoMerge pull request #33 from achbed/dev
Guillaume Pellerin [Fri, 21 Nov 2014 09:13:00 +0000 (10:13 +0100)]
Merge pull request #33 from achbed/dev

Core Changes round 3

10 years agoAdded some logging when a station fails to initialize
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>
10 years agoFixed a few issues with setting up logging
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>
10 years agoEnsure that integer parameters are treated properly
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>
10 years agoReverted a lot of changes
achbed [Fri, 21 Nov 2014 05:33:47 +0000 (23:33 -0600)]
Reverted a lot of changes

Signed-off-by: achbed <github@achbed.org>
10 years agoAdded documentation
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>
10 years agoMerge remote-tracking branch 'remotes/upstream/dev' into dev
achbed [Thu, 20 Nov 2014 21:56:33 +0000 (15:56 -0600)]
Merge remote-tracking branch 'remotes/upstream/dev' into dev

10 years agoMerge pull request #31 from achbed/dev-stationfolder
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

10 years agoMerge branch 'dev-stationfolder' into dev
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

10 years agoTypo
achbed [Thu, 20 Nov 2014 06:00:14 +0000 (00:00 -0600)]
Typo

Signed-off-by: achbed <github@achbed.org>
10 years agoCore fix for inconsistent list object for station preferences
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>
10 years agoAdded stationdefaults parameter (provides a mechanism to give default values for...
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>
10 years agoMerge pull request #28 from achbed/dev-dsw
Guillaume Pellerin [Wed, 19 Nov 2014 22:43:05 +0000 (23:43 +0100)]
Merge pull request #28 from achbed/dev-dsw

JSON Feed Support

10 years agoMerge branch 'dev-jsonfeed' into dev-dsw
achbed [Wed, 19 Nov 2014 22:16:05 +0000 (16:16 -0600)]
Merge branch 'dev-jsonfeed' into dev-dsw

Conflicts:
deefuzzer/station.py

10 years agoMerge pull request #26 from achbed/dev
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

10 years agoFixed documented example with renamed feeds tag
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>
10 years agoUpdated example config files with new/renamed options
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>
10 years agoMissing json import
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>
10 years agoMerge branch 'dev-jsonfeed' into dev-dsw
achbed [Wed, 19 Nov 2014 20:51:18 +0000 (14:51 -0600)]
Merge branch 'dev-jsonfeed' into dev-dsw

Conflicts:
deefuzzer/station.py

10 years agoAdded ability to export json data as well as RSS feeds
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>
10 years agotab to space (for indent issues)
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>
10 years agoAdded examples for appendtype
achbed [Wed, 19 Nov 2014 17:00:24 +0000 (11:00 -0600)]
Added examples for appendtype

Signed-off-by: achbed <github@achbed.org>
10 years agoAdd option to append stream type to the mount path for icecast streams. Default...
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>
10 years agoMerge pull request #23 from ChoiZ/dev
Guillaume Pellerin [Wed, 13 Aug 2014 22:18:22 +0000 (00:18 +0200)]
Merge pull request #23 from ChoiZ/dev

Remove unnecessary variables

10 years agoRemove unnecessary variables
François LASSERRE [Wed, 13 Aug 2014 19:52:27 +0000 (21:52 +0200)]
Remove unnecessary variables

10 years agoMerge branch 'dev' of github.com:yomguy/DeeFuzzer into dev
Guillaume Pellerin [Thu, 7 Aug 2014 10:00:11 +0000 (12:00 +0200)]
Merge branch 'dev' of github.com:yomguy/DeeFuzzer into dev

10 years agocleanup Manifest (fix #19)
Guillaume Pellerin [Thu, 7 Aug 2014 09:59:38 +0000 (11:59 +0200)]
cleanup Manifest (fix #19)

10 years agoMerge pull request #17 from ChoiZ/dev
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

10 years agoAdd 0.6.6
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

10 years agoMerge branch 'master' into dev
Guillaume Pellerin [Wed, 6 Aug 2014 17:57:36 +0000 (19:57 +0200)]
Merge branch 'master' into dev

10 years agoMerge branch 'dev' of github.com:yomguy/DeeFuzzer 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

10 years agobegin station_dir parameter
Guillaume Pellerin [Wed, 6 Aug 2014 17:56:42 +0000 (19:56 +0200)]
begin station_dir parameter

10 years agoMerge pull request #16 from ChoiZ/dev
Guillaume Pellerin [Wed, 6 Aug 2014 14:43:59 +0000 (16:43 +0200)]
Merge pull request #16 from ChoiZ/dev

Minor changes

10 years agoMerge pull request #15 from ChoiZ/patch-2
Guillaume Pellerin [Wed, 6 Aug 2014 14:40:51 +0000 (16:40 +0200)]
Merge pull request #15 from ChoiZ/patch-2

Update README.rst

10 years agoMerge pull request #14 from ChoiZ/patch-1
Guillaume Pellerin [Wed, 6 Aug 2014 14:40:30 +0000 (16:40 +0200)]
Merge pull request #14 from ChoiZ/patch-1

Update README.rst

10 years agoDelete CHANGELOG
François LASSERRE [Wed, 6 Aug 2014 14:15:14 +0000 (16:15 +0200)]
Delete CHANGELOG

Remove old CHANGELOG file.

10 years agoMerge branch 'ogg_quality' into dev
François LASSERRE [Wed, 6 Aug 2014 09:44:52 +0000 (11:44 +0200)]
Merge branch 'ogg_quality' into dev

10 years agoRemove 'ogg_quality' in mp3 stream
François LASSERRE [Wed, 6 Aug 2014 09:44:28 +0000 (11:44 +0200)]
Remove 'ogg_quality' in mp3 stream

10 years agoMerge branch 'stream_description_url' into dev
François LASSERRE [Wed, 6 Aug 2014 09:41:09 +0000 (11:41 +0200)]
Merge branch 'stream_description_url' into dev

10 years agoRemove channel url in station name
François LASSERRE [Wed, 6 Aug 2014 09:39:54 +0000 (11:39 +0200)]
Remove channel url in station name

10 years agoMerge branch 'metadatas_separation' into dev
François LASSERRE [Wed, 6 Aug 2014 09:38:49 +0000 (11:38 +0200)]
Merge branch 'metadatas_separation' into dev

10 years agoUpdate song separation mark
François LASSERRE [Wed, 6 Aug 2014 09:34:44 +0000 (11:34 +0200)]
Update song separation mark
 Replace "artist : title" by "artist - title"

10 years agofix version
Guillaume Pellerin [Tue, 5 Aug 2014 18:16:05 +0000 (20:16 +0200)]
fix version

10 years agoMerge branch 'master' into dev
Guillaume Pellerin [Tue, 5 Aug 2014 18:15:22 +0000 (20:15 +0200)]
Merge branch 'master' into dev

10 years agoMerge branch 'dev' of github.com:yomguy/DeeFuzzer 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

10 years agofix non-absolute log and m3u paths
Guillaume Pellerin [Tue, 5 Aug 2014 18:14:36 +0000 (20:14 +0200)]
fix non-absolute log and m3u paths

10 years agoUpdate README.rst
François LASSERRE [Tue, 5 Aug 2014 17:19:06 +0000 (19:19 +0200)]
Update README.rst

Fix github link for DeeFuzzer logo :)

10 years agoUpdate README.rst
François LASSERRE [Tue, 5 Aug 2014 16:50:30 +0000 (18:50 +0200)]
Update README.rst

Fix github link for DeeFuzzer logo :)

10 years agoMerge pull request #12 from ChoiZ/patch-1
Guillaume Pellerin [Tue, 5 Aug 2014 16:05:12 +0000 (18:05 +0200)]
Merge pull request #12 from ChoiZ/patch-1

Update README.rst

10 years agoMerge pull request #13 from ChoiZ/dev
Guillaume Pellerin [Tue, 5 Aug 2014 16:04:15 +0000 (18:04 +0200)]
Merge pull request #13 from ChoiZ/dev

Update configuration files

10 years agoRemove trailing whitespaces.
François LASSERRE [Mon, 4 Aug 2014 19:22:33 +0000 (21:22 +0200)]
Remove trailing whitespaces.
Reorder each files.

10 years agoUpdate README.rst
François LASSERRE [Sat, 2 Aug 2014 15:13:43 +0000 (17:13 +0200)]
Update README.rst

Fix examples URL.

10 years agoMerge branch 'dev'
Guillaume Pellerin [Sun, 20 Jul 2014 12:19:47 +0000 (14:19 +0200)]
Merge branch 'dev'

Conflicts:
deefuzzer/station.py

10 years agofix id
Guillaume Pellerin [Sun, 20 Jul 2014 12:19:03 +0000 (14:19 +0200)]
fix id

10 years agofix no rss
Guillaume Pellerin [Sun, 20 Jul 2014 12:13:25 +0000 (14:13 +0200)]
fix no rss

10 years agofix
Guillaume Pellerin [Sun, 20 Jul 2014 12:01:43 +0000 (14:01 +0200)]
fix

10 years agofix first playlist build
Guillaume Pellerin [Sun, 20 Jul 2014 12:00:02 +0000 (14:00 +0200)]
fix first playlist build

10 years agojust twitter
Guillaume Pellerin [Sun, 20 Jul 2014 11:37:37 +0000 (13:37 +0200)]
just twitter

10 years agojust twitter
Guillaume Pellerin [Sun, 20 Jul 2014 11:37:37 +0000 (13:37 +0200)]
just twitter

10 years agoNo twitter on first playlist build
Guillaume Pellerin [Sun, 20 Jul 2014 11:34:00 +0000 (13:34 +0200)]
No twitter on first playlist build

10 years agoNo twitter on first playlist build
Guillaume Pellerin [Sun, 20 Jul 2014 11:34:00 +0000 (13:34 +0200)]
No twitter on first playlist build

10 years agoallow empty field in rss.media_url (fix #8)
Guillaume Pellerin [Sat, 5 Jul 2014 18:45:12 +0000 (20:45 +0200)]
allow empty field in rss.media_url (fix #8)

10 years agoNo signal for pycurl streamer
Guillaume Pellerin [Mon, 26 May 2014 09:39:19 +0000 (11:39 +0200)]
No signal for pycurl streamer

10 years agoMerge branch 'dev'
Guillaume Pellerin [Mon, 26 May 2014 09:38:48 +0000 (11:38 +0200)]
Merge branch 'dev'

10 years agocleanup
Guillaume Pellerin [Mon, 26 May 2014 09:38:39 +0000 (11:38 +0200)]
cleanup

10 years agoadd a little converter from XML to YAML
Guillaume Pellerin [Mon, 26 May 2014 01:33:08 +0000 (03:33 +0200)]
add a little converter from XML to YAML

10 years agoupdate deps
Guillaume Pellerin [Sat, 24 May 2014 08:55:43 +0000 (10:55 +0200)]
update deps

10 years agoadd deps for travis
Guillaume Pellerin [Fri, 23 May 2014 15:16:12 +0000 (17:16 +0200)]
add deps for travis

10 years agoAdd deps for travis
Guillaume Pellerin [Fri, 23 May 2014 14:45:46 +0000 (16:45 +0200)]
Add deps for travis

10 years agoAdd JSON conf parsing, add any conf parameter as an attribute to the DeeFuzzer class...
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)

11 years agocleanup, better exception handling, add partial WebM support, add a curl based stream...
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

11 years agoadd travis tests
Guillaume Pellerin [Fri, 6 Dec 2013 08:36:22 +0000 (09:36 +0100)]
add travis tests

11 years agoback to 0.6.5
Guillaume Pellerin [Fri, 6 Dec 2013 08:29:31 +0000 (09:29 +0100)]
back to 0.6.5