Index: channels/__init__.py ================================================================== --- channels/__init__.py +++ channels/__init__.py @@ -44,10 +44,11 @@ # Only export plugin classes __all__ = [ "GenericChannel", "ChannelPlugin", "use_rx", "entity_decode", "strip_tags", "nl", "unhtml", "to_int" ] +#__path__.insert(0, conf.plugin_dir) # generic channel module --------------------------------------- class GenericChannel(object): Index: channels/dnd.py ================================================================== --- channels/dnd.py +++ channels/dnd.py @@ -1,11 +1,11 @@ # encoding: UTF-8 # api: streamtuner2 -# title: Drag and Drop (experimental) +# title: Drag and Drop # description: Copy streams/stations from and to other applications. -# depends: uikit -# version: 0.5 +# depends: uikit >= 1.8, action >= 1.0 +# version: 0.6 # type: feature # config: # { name: dnd_format, type: select, value: xspf, select: "pls|m3u|xspf|jspf|asx|smil|desktop|srv", description: "Default temporary file format for copying a station." } # category: io # priority: default Index: channels/file.py ================================================================== --- channels/file.py +++ channels/file.py @@ -1,11 +1,11 @@ # api: streamtuner2 # title: File browser # description: Displays mp3/oggs or m3u/pls files from local media file directories. # type: channel # category: local -# version: 0.1 +# version: 0.2 # priority: optional # depends: mutagen # config: # { name: file_browser_dir, type: text, value: "$XDG_MUSIC_DIR, ~/MP3", description: "List of directories to scan for audio files." }, # { name: file_browser_ext, type: text, value: "mp3,ogg, m3u,pls,xspf, avi,flv,mpg,mp4", description: "File type/extension filter." }, Index: channels/global_key.py ================================================================== --- channels/global_key.py +++ channels/global_key.py @@ -7,11 +7,11 @@ # config: # { name="switch_key", type="text", value="XF86Forward", description="Global key shortcut for switching radio." }, # { name="switch_channel", type="text", value="bookmarks:favourite", description="Station list and channels to alternate in." }, # { name="switch_random", type="boolean", value=0, description="Pick random channel, instead of next." }, # priority: extra -# depends: python-keybinder +# depends: python:keybinder, uikit >= 1.5 # # # Binds a key to global desktop (F13 = left windows key). # On keypress switches the currently playing radio station # to another one from the bookmarks list. Index: channels/myoggradio.py ================================================================== --- channels/myoggradio.py +++ channels/myoggradio.py @@ -4,11 +4,11 @@ # description: Open source internet radio directory. # type: channel # category: radio # version: 0.7 # url: http://www.myoggradio.org/ -# depends: json, StringIO +# depends: json, StringIO, ahttp >= 1.2 # config: # { name: myoggradio_login, type: text, value: "user:password", description: "Account for storing personal favourites." } # { name: myoggradio_morph, type: boolean, value: 0, description: "Convert pls/m3u into direct shoutcast url." } # priority: standard # png: Index: config.py ================================================================== --- config.py +++ config.py @@ -391,12 +391,11 @@ # · fn= to read from literal files, out of a .pyzip package # · src= to extract from pre-read script code # · module= utilizes pkgutil to read # · frame= automatically extract comment header from caller # -plugin_base = ("channels", "plugins") -def plugin_meta(fn=None, src=None, module=None, frame=1): +def plugin_meta(fn=None, src=None, module=None, frame=1, plugin_base=["channels", "plugins"]): # try via pkgutil first if module: fn = module for base in plugin_base: Index: st2.py ================================================================== --- st2.py +++ st2.py @@ -1,7 +1,6 @@ #!/usr/bin/env python -# # encoding: UTF-8 # api: python # type: application # title: streamtuner2 # description: Directory browser for internet radio, audio and video streams Index: uikit.py ================================================================== --- uikit.py +++ uikit.py @@ -1,11 +1,11 @@ # encoding: UTF-8 # api: python # type: functions # title: uikit helper functions # description: simplify usage of some gtk widgets -# version: 1.8 +# version: 1.9 # author: mario # license: public domain # # Wrappers around gtk methods. The TreeView method .columns() allows # to fill a treeview. It adds columns and data rows with a mapping