Check-in [95f6f0f64f]
Overview
Comment: | Support netrc account lookup (for MyOggRadio). |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
95f6f0f64fa263d8bf948e1e8af346b9 |
User & Date: | mario on 2015-03-30 17:41:46 |
Other Links: | manifest | tags |
Context
2015-03-30
| ||
17:42 | Use absolute path (conf.share) for plugin lookup with pkgutil. check-in: 665f4b36ad user: mario tags: trunk | |
17:41 | Support netrc account lookup (for MyOggRadio). check-in: 95f6f0f64f user: mario tags: trunk | |
17:40 | Load main module meta data. check-in: a678391248 user: mario tags: trunk | |
Changes
Modified channels/myoggradio.py from [a6b1955e45] to [013f2545e5].
1 2 3 4 5 6 | # # api: streamtuner2 # title: MyOggRadio # description: Open source internet radio directory. # type: channel # category: radio | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | # # api: streamtuner2 # title: MyOggRadio # description: Open source internet radio directory. # type: channel # category: radio # version: 0.6 # url: http://www.myoggradio.org/ # depends: json, StringIO # 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 # |
︙ | ︙ | |||
35 36 37 38 39 40 41 | import copy # open source radio sharing stie class myoggradio(ChannelPlugin): | | | < < > > > | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | import copy # open source radio sharing stie class myoggradio(ChannelPlugin): # settings title ="MOR" module = "myoggradio" api = "http://www.myoggradio.org/" listformat = "url/direct" # hide unused columns titles = dict(playing=False, listeners=False, bitrate=False) # category map categories = ['common', 'personal'] default = 'common' current = 'common' # netrc instance netrc = None # prepare GUI def __init__(self, parent): ChannelPlugin.__init__(self, parent) if parent: |
︙ | ︙ | |||
169 170 171 172 173 174 175 | data = dict(zip(["benutzer", "passwort"], login)) http.get(self.api + "c_login.jsp", params=data, ajax=1) # let's hope the JSESSIONID cookie is kept # returns login (user,pw) def user_pw(self): | | | | > > > | 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 | data = dict(zip(["benutzer", "passwort"], login)) http.get(self.api + "c_login.jsp", params=data, ajax=1) # let's hope the JSESSIONID cookie is kept # returns login (user,pw) def user_pw(self): if len(conf.myoggradio_login) and conf.myoggradio_login != "user:password": return conf.myoggradio_login.split(":") else: lap = conf.netrc(["myoggradio", "myoggradio.org", "www.myoggradio.org"]) if lap: return [lap[0] or lap[1], lap[2]] pass |
Modified config.py from [1687cc55ba] to [799d76f2f1].
︙ | ︙ | |||
29 30 31 32 33 34 35 36 37 38 39 40 41 42 | # export symbols __all__ = ["conf", "__print__", "dbg", "plugin_meta"] #-- create a stub instance of config object conf = object() #-- global configuration data --------------------------------------------- class ConfigDict(dict): | > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > > > > > > > > > > > > > > > | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 | # export symbols __all__ = ["conf", "__print__", "dbg", "plugin_meta"] #-- create a stub instance of config object conf = object() # separate instance of netrc, if needed netrc = None #-- global configuration data --------------------------------------------- class ConfigDict(dict): # start def __init__(self): # object==dict means conf.var is conf["var"] self.__dict__ = self # let's pray this won't leak memory due to recursion issues # prepare self.defaults() self.xdg() # runtime self.share = os.path.dirname(os.path.abspath(__file__)) # settings from last session last = self.load("settings") if (last): if "share" in last: del last["share"] self.update(last) self.migrate() # store defaults in file else: self.save("settings") self.firstrun = 1 # some defaults def defaults(self): self.play = { "audio/mpeg": "audacious ", # %u for url to .pls, %g for downloaded .m3u "audio/ogg": "audacious ", "audio/*": "audacious ", "video/youtube": "totem $(youtube-dl -g %srv)", "video/*": "vlc --one-instance %srv", "url/http": "sensible-browser", } self.record = { "audio/*": "xterm -e streamripper %srv", # -d /home/***USERNAME***/Musik "video/youtube": "xterm -e \"youtube-dl %srv\"", } self.plugins = { "bookmarks": 1, # built-in plugin, cannot be disabled "search": 1, "streamedit": 1, "configwin": 1, "shoutcast": 1, "xiph": 1, "modarchive": 0, # disable per default "file": 0, # disable per default "punkcast": 0, # disable per default "history": 0, "basicch": 0, # ceased "tv": 0, # ceased } self.tmp = os.environ.get("TEMP", "/tmp") self.max_streams = "500" self.show_bookmarks = 1 self.show_favicons = 1 self.load_favicon = 1 self.heuristic_bookmark_update = 0 self.retain_deleted = 0 self.auto_save_appstate = 1 self.theme = "" #"MountainDew" self.channel_order = "shoutcast, xiph, internet_radio, jamendo, myoggradio, .." self.reuse_m3u = 1 self.google_homepage = 0 self.windows = platform.system()=="Windows" self.pyquery = 1 self.debug = 0 # each plugin has a .config dict list, we add defaults here def add_plugin_defaults(self, config, module=""): # options for opt in config: if ("name" in opt) and ("value" in opt) and (opt["name"] not in vars(self)): self.__dict__[opt["name"]] = opt["value"] # plugin state if module and module not in conf.plugins: conf.plugins[module] = 1 # http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html def xdg(self, path="/streamtuner2"): home = os.environ.get("HOME", self.tmp) config = os.environ.get("XDG_CONFIG_HOME", os.environ.get("APPDATA", home+"/.config")) # storage dir self.dir = config + path # create if necessary if (not os.path.exists(self.dir)): os.makedirs(self.dir) # store some configuration list/dict into a file def save(self, name="settings", data=None, gz=0, nice=0): name = name + ".json" if (data is None): data = dict(self.__dict__) # ANOTHER WORKAROUND: typecast to plain dict(), else json filter_data sees it as object and str()s it nice = 1 # check for subdir if (name.find("/") > 0): subdir = name[0:name.find("/")] subdir = self.dir + "/" + subdir if (not os.path.exists(subdir)): os.mkdir(subdir) open(subdir+"/.nobackup", "w").close() # write file = self.dir + "/" + name # .gz or normal file if gz: f = gzip.open(file+".gz", "w") if os.path.exists(file): os.unlink(file) else: f = open(file, "w") # encode data = json.dumps(data, indent=(4 if nice else None)) try: f.write(data.encode("utf-8")) except TypeError as e: f.write(data) # Python3 sometimes wants to write strings rather than bytes f.close() # retrieve data from config file def load(self, name): name = name + ".json" file = self.dir + "/" + name try: # .gz or normal file if os.path.exists(file + ".gz"): f = gzip.open(file + ".gz", "rt") elif os.path.exists(file): f = open(file, "rt") else: return # file not found # decode r = json.load(f) f.close() return r except Exception as e: print(dbg.ERR, "JSON parsing error (in "+name+")", e) # recursive dict update def update(self, with_new_data): for key,value in with_new_data.items(): if type(value) == dict: self[key].update(value) else: self[key] = value # descends into sub-dicts instead of wiping them with subkeys # update old setting names def migrate(self): # 2.1.1 if "audio/mp3" in self.play: self.play["audio/mpeg"] = self.play["audio/mp3"] del self.play["audio/mp3"] # check for existing filename in directory list def find_in_dirs(self, dirs, file): for d in dirs: if os.path.exists(d+"/"+file): return d+"/"+file # standard user account storage in ~/.netrc or less standard but contemporarily in ~/.config/netrc def netrc(self, varhosts=("shoutcast.com")): global netrc if not netrc: netrc = {} try: from netrc import netrc as parser try: netrc = parser().hosts except: netrc = parser(self.xdg() + "/netrc").hosts except: pass for server in varhosts: if server in netrc: return netrc[server] # Plugin meta data extraction # # Extremely crude version for Python and streamtuner2 plugin usage. # Fetches module source, or reads from filename / out of zip package. def plugin_meta(fn=None, src=None, frame=1): |
︙ | ︙ |
Modified help/channel_myoggradio.page from [23cd12b6a8] to [c7e655e988].
︙ | ︙ | |||
19 20 21 22 23 24 25 | streamtuner2 provides an option to share radion station links. Use <guiseq><gui>Station</gui> <gui>Extensions</gui> <gui>Share on MyOggRadio...</gui></guiseq> menu entry to upload the currently selected radio (e.g. from your favourite bookmarks).</p> <p>The personal section is empty per default. You need to specify an user account in the settings dialog, and actually bookmark stations in the MyOggRadio web site. | | > | < | | | > > > > > > > > > > > > > > | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | streamtuner2 provides an option to share radion station links. Use <guiseq><gui>Station</gui> <gui>Extensions</gui> <gui>Share on MyOggRadio...</gui></guiseq> menu entry to upload the currently selected radio (e.g. from your favourite bookmarks).</p> <p>The personal section is empty per default. You need to specify an user account in the settings dialog, and actually bookmark stations in the MyOggRadio web site. Shared entries aren't automatically in the <gui style="button">personal</gui> list.</p> <note style="tip"><p>MyOggRadio also has a neat cross-platform player: <link href="http://freshcode.club/projects/jmorp">JMyOggRadioPlayer</link>.</p></note> <terms> <title>Channel options.</title> <item> <title><code>Login settings</code></title> <p>If you want to upload station infos to MyOggRadio, you need an account there. Registration is free and doesn't require personal information nor email address. Specify it as <input>username:</input> separated with a : colon in this field.</p> <note style="advanced"> <p>Alternatively you can store your account settings in the central <file>~/.netrc</file> config file. Or in <file>~/.config/netc</file> even.</p> <p>Your entry for MyOggRadio should follow the common format:</p> <code> machine myoggradio.org login usr123 password pw123 </code> <p>Which is useful because it's a standard format, and prevents leaking authorization data into per-application config stores. Note that a user:pw setting in streamtuner takes precedence though.</p> </note> </item> <item> <title><code>stream URL format</code></title> <p>When uploading stations, the streaming URL can be converted into RAW format. You can however leave it as .PLS link file.</p> </item> </terms> </page> |