From b03a8d916033dc0eeda51a131b3b6c9851bf414d Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 23 Mar 2012 12:04:07 +0100 Subject: [PATCH] fix various infos, definitely moved to pypi and github --- CHANGELOG.txt => CHANGELOG | 0 INSTALL.rst | 92 -------------------------------------- LICENSE.txt => LICENSE | 0 README.rst | 59 +++++++++++++++++++++++- deefuzzer/__init__.py | 2 +- scripts/deefuzzer | 21 +++++---- setup.py | 12 +++-- 7 files changed, 73 insertions(+), 113 deletions(-) rename CHANGELOG.txt => CHANGELOG (100%) delete mode 100644 INSTALL.rst rename LICENSE.txt => LICENSE (100%) diff --git a/CHANGELOG.txt b/CHANGELOG similarity index 100% rename from CHANGELOG.txt rename to CHANGELOG diff --git a/INSTALL.rst b/INSTALL.rst deleted file mode 100644 index 92f27ad..0000000 --- a/INSTALL.rst +++ /dev/null @@ -1,92 +0,0 @@ -# -*- coding: utf-8 -*- -# -# Copyright (c) 2007-2010 Guillaume Pellerin -# All rights reserved. -# -# This software is licensed as described in the file COPYING, which -# you should have received as part of this distribution. The terms -# are also available at http://svn.parisson.org/deefuzzer/DeeFuzzLicense. -# -# Author: Guillaume Pellerin - - -Dependencies -============= - -depends: python, python-dev, python-xml, python-shout | shout-python, libshout3, - libshout3-dev, python-mutagen - -provides: shout-python | python-shout, python-tinyurl - -optional: python-twitter, python-liblo | pyliblo (>= 0.26) - -recommends: icecast2, python-setuptools, stream-m - - -Install -========= - -Please first install libshout3 and liblo from source OR libshout3-dev and liblo-dev from your own distribution package manager. - -Now, the easiest way to install the DeeFuzzer from a shell:: - - sudo pip install deefuzzer - -or:: - - sudo easy_install install deefuzzer - -To install the DeeFuzzer from sources, go to the main deefuzzer app directory, for example:: - - cd deefuzzer-0.5.0 - -and run:: - - sudo python setup.py install - -For more informations, see http://svn.parisson.org/deefuzzer/ - - -Twitter (manual and optional) -================================ - -To get track twitting, please install python-twitter, python-oauth2 and all their dependencies. - -Install python-oauth2:: - - sudo easy_install oauth2 - -Get and install python-twitter (>= 0.8.1):: - - wget http://python-twitter.googlecode.com/files/python-twitter-0.8.1.tar.gz - tar xzf python-twitter-0.8.1.tar.gz - cd python-twitter-0.8.1 - sudo python setup.py install - -As Twitter access requires oauth keys since 07/2010, you need to get your own access token key pair. -Please run the dedicated script to do this from the main deefuzzer app directory:: - - python tools/get_access_token.py - -You will be invited to copy/paste an URL in your browser to get a pin code. -Then copy/paste this code into the console and press ENTER. -The script gives you a pair of keys : one access token key and one access token secret key. - -Change the block options in your deefuzzer XML config file, giving the 2 keys. -For example:: - - - 1 - 85039615-H6yAtXXCx7NobF5W40FV0c8epGZsQGkE7MG6XRjD2 - A1YW3llB9H9qVbjH8zOQTOkMlhVqh2a7LnA9Lt0b6Gc - Music Groove - - -Your DeeFuzzer will now tweet the currently playing track and new tracks on your profile. - - -OSC Control -============= - -Working, but no doc yet. Please read the code :) - diff --git a/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE diff --git a/README.rst b/README.rst index 71d0780..2e30c25 100644 --- a/README.rst +++ b/README.rst @@ -29,6 +29,30 @@ Please see example/deefuzzer.xml for an example. Because our aim is to get DeeFuzzer as light as possible it is NOT capable of re-encoding or transcoding media files. +News +===== + +0.6.1 is out ! + + * new HTTP steamer based on pycurl to handle streaming over stream-m servers (WebM streaming) + see http://code.google.com/p/stream-m/ + * live webm relaying works good, webm playlist reading NEED testing + * new parameter ('icecast or 'stream-m') + +Enjoy the video streaming ! ;) + +`Full CHANGELOG `_ + +Dependencies +============= + +depends: python, python-dev, python-xml, python-shout | shout-python, libshout3, + libshout3-dev, python-mutagen, python-pycurl | pycurl + +optional: python-twitter, python-liblo | pyliblo (>= 0.26) + +recommends: icecast2, python-setuptools, stream-m + Installation ============ @@ -46,7 +70,7 @@ or:: sudo easy_install deefuzzer -To install the DeeFuzzer from sources, download the last archive `HERE `_ +To install the DeeFuzzer from sources, download the last archive `here `_ or `here `_. Uncompress, go to the deefuzzer app directory and run install as root. For example:: @@ -114,6 +138,37 @@ Then any OSC remote (PureDate, Monome, TouchOSC, etc..) can a become controller We provide some client python scripts as some examples about how to control the parameters from a console or any application (see deefuzzer/scripts/). +Twitter (manual and optional) +================================ + +To get track twitting, please install python-twitter, python-oauth2 and all their dependencies. + +Install or make sure python-oauth2 and python-twitter are installed:: + + sudo easy_install oauth2 + sudo pip install python-twitter + +As Twitter access requires oauth keys since 07/2010, you need to get your own access token key pair. +Please run the dedicated script to do this from the main deefuzzer app directory:: + + python tools/get_access_token.py + +You will be invited to copy/paste an URL in your browser to get a pin code. +Then copy/paste this code into the console and press ENTER. +The script gives you a pair of keys : one access token key and one access token secret key. + +Change the block options in your deefuzzer XML config file, giving the 2 keys. +For example:: + + + 1 + 85039615-H6yAtXXCx7NobF5W40FV0c8epGZsQGkE7MG6XRjD2 + A1YW3llB9H9qVbjH8zOQTOkMlhVqh2a7LnA9Lt0b6Gc + Music Groove + + +Your DeeFuzzer will now tweet the currently playing track and new tracks on your profile. + Development ============ @@ -133,7 +188,7 @@ License This software is licensed as described in the file LICENSE.txt, which you should have received as part of this distribution. The terms -are also available at http://svn.parisson.org/deefuzzer/wiki/DeeFuzzerLicense +are also available at https://github.com/yomguy/DeeFuzzer/blob/master/LICENSE Aknowledgements =============== diff --git a/deefuzzer/__init__.py b/deefuzzer/__init__.py index f42a420..129afb1 100644 --- a/deefuzzer/__init__.py +++ b/deefuzzer/__init__.py @@ -2,4 +2,4 @@ from core import * from station import * from tools import * -__version__ = '0.6.1' +__version__ = '0.6.2' diff --git a/scripts/deefuzzer b/scripts/deefuzzer index 31059fe..4e763d9 100755 --- a/scripts/deefuzzer +++ b/scripts/deefuzzer @@ -5,8 +5,7 @@ import sys import shout import datetime import platform -from deefuzzer.core import DeeFuzzer -from deefuzzer import __version__ +import deefuzzer year = datetime.datetime.now().strftime("%Y") platform_system = platform.system() @@ -22,30 +21,30 @@ def prog_info(): This software is licensed as described in the file COPYING, which you should have received as part of this distribution. The terms - are also available at http://svn.parisson.org/deefuzzer/DeeFuzzerLicense + are also available at https://github.com/yomguy/DeeFuzzer/blob/master/LICENSE depends: python, python-dev, python-xml, python-shout | shout-python, libshout3, - libshout3-dev, python-mutagen + libshout3-dev, python-mutagen, python-pycurl recommends: icecast2, python-twitter, python-tinyurl, python-liblo | pyliblo (>= 0.26) Usage : deefuzzer [file] - where [file] is the path for a XML config file. - + where [file] is the path for a XML config file. + Edit an example in example/deefuzzer.xml - and then start one or more stations: - + and then start one or more stations: + $ deefuzzer example/deefuzzer.xml - see http://svn.parisson.org/deefuzzer/ for more details + see http://github.com/yomguy/DeeFuzzer for more details and debugging. """ - return desc % (__version__, platform_system, year) + return desc % (deefuzzer.__version__, platform_system, year) def main(): if len(sys.argv) >= 2: - d = DeeFuzzer(sys.argv[-1]) + d = deefuzzer.core.DeeFuzzer(sys.argv[-1]) d.start() else: text = prog_info() diff --git a/setup.py b/setup.py index c0d4853..497ce84 100644 --- a/setup.py +++ b/setup.py @@ -4,23 +4,21 @@ '''The setup and build script for the python-twitter library.''' import os - -__version__ = '0.6.1' -__author__ = 'yomguy@parisson.com' +import deefuzzer README = os.path.join(os.path.dirname(__file__), 'README.rst') # The base package metadata to be used by both distutils and setuptools METADATA = dict( name = "DeeFuzzer", - version = __version__, + version = deefuzzer.__version__, py_modules = ['deefuzzer'], - description='an easy and instant media streaming tool', + description='an open, light and instant media streaming tool', author='Guillaume Pellerin', author_email='yomguy@parisson.com', license='CeCILL', - url='http://svn.parisson.org/deefuzzer', - keywords='audio video streaming broadcast shout', + url='http://github.com/yomguy/DeeFuzzer', + keywords='media audio video streaming broadcast shout', install_requires = ['setuptools', 'tinyurl', 'python-shout', 'python-twitter', 'mutagen', 'pyliblo', 'pycurl'], packages=['deefuzzer', 'deefuzzer.tools'], include_package_data = True, -- 2.39.5