Check-in [64de51eb48]
Overview
Comment: | new plugin: recording options which hijacks the record button, provides streamripper/fPls/youtube-dl specific command-line flags in a GUI. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
64de51eb48cecf43d93f7b5ae68fba7e |
User & Date: | mario on 2017-01-22 16:46:41 |
Other Links: | manifest | tags |
Context
2017-01-22
| ||
22:15 | Enable record options getting applied. Added wget and more fPls options. Separate out row,*k,**kw params from overriden action.record() call. Simplify and rearrange gtk callbacks. check-in: c860f8c6cc user: mario tags: trunk | |
16:46 | new plugin: recording options which hijacks the record button, provides streamripper/fPls/youtube-dl specific command-line flags in a GUI. check-in: 64de51eb48 user: mario tags: trunk | |
16:45 | More special case handling on Windows: file encoding, backslashes, url quoting check-in: 4c67a494e7 user: Oliver tags: trunk | |
Changes
Modified channels/configwin.py from [461aa8a0a3] to [80c7c7f2e2].
︙ | ︙ | |||
45 46 47 48 49 50 51 | # Hide window def hide(self, *args): self.win_config.hide() return True # Load values from conf. store into gtk widgets | | | | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | # Hide window def hide(self, *args): self.win_config.hide() return True # Load values from conf. store into gtk widgets def load_config(self, config, prefix="config_", widgets={}): for key,val in config.items(): w = self.main.get_widget(prefix + key) or widgets.get(prefix + key) if w: # number if isinstance(w, gtk.SpinButton): w.set_value(int(val)) # input field elif isinstance(w, gtk.Entry): w.set_text(str(val)) |
︙ | ︙ | |||
77 78 79 80 81 82 83 | log.DATA(row) w.append([str(e) for e in row]) if len(val): w.append(["" for e in val[0]]) #log.CONF("config load", prefix+key, val, type(w)) # Store gtk widget valus back into conf. dict | | | | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | log.DATA(row) w.append([str(e) for e in row]) if len(val): w.append(["" for e in val[0]]) #log.CONF("config load", prefix+key, val, type(w)) # Store gtk widget valus back into conf. dict def save_config(self, config, prefix="config_", save=0, widgets={}): for key,val in config.items(): w = self.main.get_widget(prefix + key) or widgets.get(prefix + key) if w: # text if isinstance(w, gtk.Entry): config[key] = w.get_text() # pre-defined text elif isinstance(w, ComboBoxText): config[key] = w.get_active_text() |
︙ | ︙ | |||
125 126 127 128 129 130 131 | # Description text plugin_text = "<span size='larger' weight='heavy'>{title}</span> "\ + "<span style='italic' foreground='slate blue'>({type}/{category})</span> "\ + "<span weight='bold' foreground='#777777'>{version}</span>\n"\ + "<span size='smaller' stretch='ultraexpanded'>{description}</span>" # Add [x] plugin setting, and its configuration definitions, set defaults from conf.* | | | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | # Description text plugin_text = "<span size='larger' weight='heavy'>{title}</span> "\ + "<span style='italic' foreground='slate blue'>({type}/{category})</span> "\ + "<span weight='bold' foreground='#777777'>{version}</span>\n"\ + "<span size='smaller' stretch='ultraexpanded'>{description}</span>" # Add [x] plugin setting, and its configuration definitions, set defaults from conf.* def add_plg(self, name, meta, add_, prefix_="config_"): # Plugin enable button cb = gtk.CheckButton(name) cb.set_sensitive(not meta.get("priority") in ("core", "required", "builtin")) cb.get_children()[0].set_markup(self.plugin_text.format(**meta)) cb.set_tooltip_text(self._tooltip(meta)) add_( "config_plugins_"+name, cb, color=meta.get("color"), image=meta.get("png"), align=0) |
︙ | ︙ | |||
176 177 178 179 180 181 182 | add_({}, uikit.label("<small>%s</small>" % description, markup=True, size=455)) continue # text field else: cb = gtk.Entry() | | | 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | add_({}, uikit.label("<small>%s</small>" % description, markup=True, size=455)) continue # text field else: cb = gtk.Entry() add_( prefix_+opt["name"], cb, description, color ) # Spacer between plugins add_( None, gtk.HSeparator() ) # Reformat `doc` linebreaks for gtk.tooltip def _tooltip(self, meta): doc = meta.get("doc", "").strip() |
︙ | ︙ |
Added contrib/recordflags.py version [6b7d53ce01].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 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 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 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 | # encoding: utf-8 # api: streamtuner2 # title: Recording options # description: Allows to set streamripper/fIcy options before recording # version: 0.5 # conflicts: continuous_record # priority: optional # config: # { name: recordflags_auto, type: bool, value: 1, description: Apply options automatically once saved. } # { name: recordflags_row, type: select, value: record_flags, select: "record_flags|extras", description: Station field for saved options. } # { name: recordflags_dir, type: str, value: "", description: Default output directory. } # type: handler # category: ui # # Hijacks the ✪ record button, presents an option dialog to set various # streamripper options. Allows to set an output directory or single-file # recording for example. # # Reuses the known option scheme from the config window. Which is perhaps # less pretty than a custom dialog, but allows to show options for different # download/recording tools. # # ToDo: # → detect different record apps (fPls, wget, youtube-dl, etc.) # → implement fPls options etc. # → override main.record() instead of action.record # → eventually strip defaults such as `-d ../dir` from conf.record; # using action append= param now, thus no rewriting of assoc dict; # so this should rather go into documenation # import re import os import copy from config import * from channels import * from uikit import * import action from compat2and3 import * # hook record button / menu / action class recordflags (FeaturePlugin): # settings cfg_widget_pfx = "recordoptions_config_" widgets = {} flag_meta = { "streamripper": { "title": "streamripper", "priority": "required", "type": "app", "category": "recording", "version": "1.64.6", "description": "Standard radio stream recording app", "config": [ { "name": "A", "arg": "-A", "type": "bool", "description": "➖𝘼 Don't write individual tracks/MP3s. And whatever..... fill text", "value": False }, { "name": "a", "arg": "-a", "type": "str", "description": "➖𝙖 Single MP3 output file", "value": "" }, { "name": "dir", "arg": "-d", "type": "str", "description": "➖𝙙 Destination directory", "value": "" }, { "name": "D", "arg": "-D", "type": "str", "description": "➖𝘿 Filename pattern", "value": "" }, { "name": "s", "arg": "-s", "type": "bool", "description": "➖𝙨 No subdirectories for each stream", "value": False }, { "name": "t", "arg": "-t", "type": "bool", "description": "➖𝙩 Never overwrite incomplete tracks", "value": False }, { "name": "T", "arg": "-T", "type": "bool", "description": "➖𝙏 Truncate duplicated incompletes", "value": False }, { "name": "o", "arg": "-o", "type": "select", "description": "➖𝙨 Incomplete track overwriting", "select": "|always|never|larger|version", "value": "" }, { "name": "l", "arg": "-l", "type": "int", "description": "➖𝙡 Seconds to record", "value": 3600 }, { "name": "M", "arg": "-M", "type": "int", "description": "➖𝙈 Max megabytes to record", "value": 16 }, { "name": "xs2", "arg": "--xs2", "type": "bool", "description": "➖➖𝙭𝙨𝟮 new pause detection", "value": False }, { "name": "xsnone", "arg": "--xs-none", "type": "bool", "description": "Dont't search for/split on track silence", "value": False }, { "name": "i", "arg": "-i", "type": "bool", "description": "➖𝙞 Don't add any ID3 tags", "value": False }, { "name": "id3v1", "arg": "--with-id32v1", "type": "bool", "description": "Add ID3v1 tags", "value": False }, { "name": "noid3v2", "arg": "--without-id32v2", "type": "bool", "description": "Omit ID3v2 tags", "value": False }, { "name": "cs_fs", "arg": "--codeset-filesys", "type": "str", "description": "Charset filesystem", "value": "" }, { "name": "cs_id3", "arg": "--codeset-id3", "type": "str", "description": "Charset ID3 tags", "value": "" }, { "name": "u", "arg": "-u", "type": "str", "description": "➖𝙪 Useragent to send", "value": "" }, { "name": "p", "arg": "-p", "type": "str", "description": "➖𝙥 Url for HTTP proxy to use", "value": "" }, { "name": "r", "arg": "-r", "type": "str", "description": "➖𝙧 Relay server 'localhost:8000'", "value": "" }, { "name": "m", "arg": "-m", "type": "int", "description": "➖𝙢 Timeout for stalled connection", "value": 15 }, { "name": "debug", "arg": "--debug", "type": "bool", "description": "➖➖𝙙𝙚𝙗𝙪𝙜", "value": False }, ] }, "fPls": { "title": "fPls/fIcy", "priority": "required", "type": "app", "category": "recording", "version": "1.0.19", "description": "Alternative recording tool", "config": [ { "name": "verbose", "arg": "➖𝙫", "type": "bool", "description": "➖𝙫 Verbose mode", "value": False }, { "name": "daemon", "arg": "-d", "type": "str", "description": "➖𝙙 Daemon mode: log file", "value": "" }, # -L max Maximum playlist loops # -M time Maximum cumulative playing time # -P path Specify fIcy executable name/path # -R max Maximum per-stream retries # -T time Wait the specified time after each failure # -a file Provide HTTP credentials (user:pass file) # -i time Maximum network idle time # -l num Redirect follow limit ] }, "youtube-dl": { "title": "youtuble-dl", "priority": "required", "type": "app", "category": "download", "version": "2017.02.11.3", "description": "Youtube downloader", "config": [ { "name": "freeformats", "arg": "--prefer-free-formats", "type": "bool", "description": "Prefer free audio formats", "value": False }, { "name": "format", "arg": "-f", "type": "select", "select": "=any|b=best|249=webm audio only DASH|250=webm audio only DASH|140=m4a audio only DASH|171=webm audio only DASH|251=webm audio only DASH|278=webm 256x144 DASH|160=mp4 256x144 DASH|242=webm 426x240 DASH|133=mp4 426x240 DASH|243=webm 640x360 DASH|134=mp4 640x360 DASH|244=webm 854x480 DASH|135=mp4 854x480 DASH|247=webm 1280x720 DASH|136=mp4 1280x720 DASH|248=webm 1920x1080 DASH|137=mp4 1920x1080 DASH|17=3gp 176x144 small|36=3gp 320x180 small|43=webm 640x360 medium|18=mp4 640x360 medium|22=mp4 1280x720 hd720", "description": "➖𝙛 Format", "value": "b" }, { "name": "c", "arg": "-c", "type": "bool", "description": "➖𝙘 Continue partial downloads ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ", "value": True }, { "name": "netrc", "arg": "-n", "type": "bool", "description": "➖𝙣 Use .netrc for auth/login", "value": False }, { "name": "ignore", "arg": "-i", "type": "bool", "description": "➖𝙞 Ignore errors", "value": False }, { "name": "proxy", "arg": "--proxy", "type": "str", "description": "➖𝙥 Proxy", "value": "" }, { "name": "verbose", "arg": "-v", "type": "bool", "description": "➖𝙫 Verbose mode", "value": False }, { "name": "ipv4", "arg": "-4", "type": "bool", "description": "➖𝟰 Use IPv4", "value": False }, { "name": "ipv6", "arg": "-6", "type": "bool", "description": "➖𝟲 Use IPv6", "value": False }, ] } } # current selection (dialog only runs once anyway, so we can keep flags in same object) app = "streamripper" argmap = {} # "--xs2" => "xs2" namemap = {} # "xs2" => "--xs2" typemap = {} # "xs2" => "bool" defmap = {} # "opt" => "default" # hooks for user interface/handlers def init2(self, parent, *a, **kw): # TEMPORARY WORKAROUND: swap action.record() action.record = self.action_record # BETTER APPROACH: hook record button #parent.on_record_clicked = self.show_window # add menu entry (for simple triv#1 option) uikit.add_menu([parent.streammenu], "Set single MP3 record -A flag", self.set_cont) # default widget actions parent.win_recordoptions.connect("delete-event", self.hide) parent.recordoptions_eventbox.modify_bg(gtk.STATE_NORMAL, gtk.gdk.Color("#442211")) # shortcuts self.add_plg = parent.configwin.add_plg # create _cfg widgets self.load_config = parent.configwin.load_config # populate _cfg widgets self.save_config = parent.configwin.save_config # save from _cfg widgets self.recordoptions_cfg = parent.recordoptions_cfg # our vbox widget self.map_app_args(self.app) # prepares a few shortcuts def map_app_args(self, app): config = self.flag_meta[app]["config"] self.argmap = { row["arg"]: row["name"] for row in config if row.get("arg") } self.namemap = dict(zip(self.argmap.values(), self.argmap.keys())) self.typemap = { row["name"]: row["type"] for row in config if row.get("type") } self.defmap = { row["name"]: row["value"] for row in config if row.get("value") is not None } log.CONF(self.defmap) # triv #1 menu option → only saves `-A` flag to row["recordflags"] def set_cont(self, row): row[conf.recordflags_row] = "-A" # hook for action.record def action_record(self, row={}, *k, **kw): kw["assoc"] = conf.record # default if not self.can_handle(row): return action.run_fmt_url(row, *k, **kw) # use saved settings if conf.recordflags_auto and row.get(conf.recordflags_row): kw["append"] = " " + row[cont.recordflags_row] return action.run_fmt_url(row, *k, **kw) # else bring up win_recordoptions else: self.show_dialog(row, *k, **kw) # (row, audioformat, source, assoc, append=append) # only handle audio/* streamripper formats def can_handle(self, row): # check for general MIME types #if not row.get("format") in ("audio/mpeg", "audio/aac", "audio/ogg"): # return False # search for configured (flag_meta) apps in conf.record["audio/*"] dict rx_apps = "\\b(?i)(" + ("|".join(self.flag_meta.keys())) + ")\\b" #print rx_apps cmd = action.mime_app(row.get("format", "audio/*"), conf.record) match = re.findall(rx_apps, cmd or "") log.PROC(cmd) if cmd and match: log.STAT(match) self.app = match[0] self.map_app_args(self.app) return True return False # overriden handler def do_record(self, row, audioformat="audio/mpeg", source="href", assoc={}, append=None): self.hide() append = self.args_from_configwin() #print append log.EXEC(action.run_fmt_url, row, audioformat, source, assoc or conf.record, append) #action.run_fmt_url(row, audioformat, source, assoc, append=append) # option window def show_dialog(self, row, *k, **kw): p = self.parent # set labels, connect buttons p.recordoptions_title.set_text(row["title"][0:50]) p.recordoptions_url.set_text(row["url"][0:50]) p.recordoptions_go.connect("clicked", lambda *x: self.do_record(row, *k, **kw)) p.recordoptions_save.connect("clicked", lambda *x: self.save_only(row, *k, **kw)) # add option widgets self.load_config_widgets(row, self.app, p) # show window p.win_recordoptions.show() # Put config widgets into recordoptions_cfg vbox def add_flag(self, id=None, w=None, label=None, color=None, image=None, align=5): self.parent.recordoptions_cfg.pack_start(uikit.wrap(self.widgets, id, w, label, color, image, align, label_markup=1, label_size=250)) # populate config widgets, seth defaults/current settings def load_config_widgets(self, row, group="streamripper", p=None): # clean up previous [self.recordoptions_cfg.remove(w) for w in self.recordoptions_cfg.get_children()] # add plugins self.add_plg(group, self.flag_meta[group], self.add_flag, self.cfg_widget_pfx) # set values self.load_config(self.configdict_from_args(row), self.cfg_widget_pfx, widgets=self.widgets) # return "--args str" for current config widget states def args_from_configwin(self): cfg = { name: None for name in self.namemap.keys() } self.save_config(cfg, self.cfg_widget_pfx, widgets=self.widgets) log.DATA(cfg) return self.args_from_configdict(cfg) #-- parse existing `record_flags` and conf.record defauls into name-config def configdict_from_args(self, row): r = copy.copy(self.defmap) # saved `record_flags` cmdstr = row.get(conf.recordflags_row, "") # add default options from configured recoding app if conf.record.get("audio/*"): add = re.findall('"(.+?)"', conf.record["audio/*"]) cmdstr = add[0] + " " + cmdstr # global/default plugin option, if set if conf.recordflags_dir: r["dir"] = conf.recordflags_dir # extract for arg,val in re.findall("""(-\w+|--[\w-]+)\s*("[^"]+"|'[^']+'|[^-]+)?""", cmdstr): if not arg in self.argmap: continue name = self.argmap[arg] r[name] = val.strip() if len(val) else 1 return r #-- convert { name=>value, .... } dict into "--arg str" def args_from_configdict(self, loaded_config): s = "" for name, val in loaded_config.items(): default = str(self.defmap.get(name)) if val in (False, None, "", default): continue arg = self.namemap[name] s = s + " " + arg if isinstance(val, (str, unicode)): # type == "bool" check here(...) s = s + " " + val return s # store current dialog settings into row[] def save_only(self, row, *k, **kw): row[conf.recordflags_row] = self.args_from_configwin() self.parent.channel().save() # override GtkWindow.destroy/delete-event def hide(self, *x): self.parent.win_recordoptions.hide() return True |
Modified gtk3.xml.gz from [3ce1546d8d] to [d613c400aa].
cannot compute difference between binary files