Check-in [7777a863d7]
Overview
Comment: | Remove verbose config: option, reclassify some record tool options. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
7777a863d7bcf0f346adb13241e6e768 |
User & Date: | mario on 2017-02-21 23:48:10 |
Other Links: | manifest | tags |
Context
2017-02-23
| ||
22:12 | Relabel record option tabs to options/meta/network; regroup flags roughly. Add more options for wget and youtube-dl. check-in: e6fe0f52d5 user: mario tags: trunk | |
2017-02-21
| ||
23:48 | Remove verbose config: option, reclassify some record tool options. check-in: 7777a863d7 user: mario tags: trunk | |
23:22 | Add notebook tabs for recordflags plugin. Instead of filtering them, distribute options into notebook tabs "_cfg", "_extra", or "_verbose". check-in: cbec1b81a6 user: mario tags: trunk | |
Changes
Modified contrib/recordflags.py from [ea23c9bd67] to [b2b742d73b].
1 2 3 4 | # encoding: utf-8 # api: streamtuner2 # title: Recording options # description: Allows to set streamripper/fIcy options before recording | | < < < < | 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 | # encoding: utf-8 # api: streamtuner2 # title: Recording options # description: Allows to set streamripper/fIcy options before recording # version: 0.8.5 # depends: streamtuner2 > 2.2.0 # 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 set options for different # download/recording tools: streamripper, fPls, youtube-dl, wget. # # Note that predefining -flags in the Apps/Recording config table might # conflict with per-stream options. In particular avoid a -d directory # default for streamripper; and use this pluginsΒ΄ option instead. # # ToDo: # β 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 # |
︙ | ︙ | |||
73 74 75 76 77 78 79 | { "name": "t", "arg": "-t", "type": "bool", "description": "<b>-t</b> Never overwrite incomplete tracks", "value": False, "category": "extra" }, { "name": "T", "arg": "-T", "type": "bool", "description": "<b>-T</b> Truncate duplicated incompletes", "value": False, "category": "extra" }, { "name": "l", "arg": "-l", "type": "int", "description": "<b>-l</b> Seconds to record", "value": 0, "max": 7*24*3600 }, { "name": "M", "arg": "-M", "type": "int", "description": "<b>-M</b> Max megabytes to record", "value": 512 }, { "name": "xs2", "arg": "--xs2", "type": "bool", "description": "<b>--xs2</b> New pause detection algorithm", "value": False }, { "name": "xsnone", "arg": "--xs-none", "type": "bool", "description": "<b>--xs-none</b> No silence splitting", "value": False, "category": "extra" }, { "name": "i", "arg": "-i", "type": "bool", "description": "<b>-i</b> Don't add any ID3 tags", "value": False, "category": "extra" }, | | | 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 | { "name": "t", "arg": "-t", "type": "bool", "description": "<b>-t</b> Never overwrite incomplete tracks", "value": False, "category": "extra" }, { "name": "T", "arg": "-T", "type": "bool", "description": "<b>-T</b> Truncate duplicated incompletes", "value": False, "category": "extra" }, { "name": "l", "arg": "-l", "type": "int", "description": "<b>-l</b> Seconds to record", "value": 0, "max": 7*24*3600 }, { "name": "M", "arg": "-M", "type": "int", "description": "<b>-M</b> Max megabytes to record", "value": 512 }, { "name": "xs2", "arg": "--xs2", "type": "bool", "description": "<b>--xs2</b> New pause detection algorithm", "value": False }, { "name": "xsnone", "arg": "--xs-none", "type": "bool", "description": "<b>--xs-none</b> No silence splitting", "value": False, "category": "extra" }, { "name": "i", "arg": "-i", "type": "bool", "description": "<b>-i</b> Don't add any ID3 tags", "value": False, "category": "extra" }, { "name": "id3v1", "arg": "--with-id3v1", "type": "bool", "description": "<b>--with-id3v1</b> Add ID3v1 tags", "value": False, "category": "extra" }, { "name": "noid3v2", "arg": "--without-id3v2", "type": "bool", "description": "<b>--without-id3v2</b> Omit ID3v2 tags", "value": False, "category": "verbose" }, { "name": "cs_fs", "arg": "--codeset-filesys", "type": "str", "description": "Charset filesystem", "value": "", "category": "extra" }, { "name": "cs_id3", "arg": "--codeset-id3", "type": "str", "description": "Charset ID3 tags", "value": "", "category": "extra" }, { "name": "u", "arg": "-u", "type": "str", "description": "<b>-u</b> User-agent (browser id)", "value": "", "category": "extra" }, { "name": "p", "arg": "-p", "type": "str", "description": "<b>-p</b> Url for HTTP proxy to use", "value": "", "category": "extra" }, { "name": "r", "arg": "-r", "type": "str", "description": "<b>-r</b> Relay server 'localhost:8000'", "value": "", "category": "extra" }, { "name": "m", "arg": "-m", "type": "int", "description": "<b>-m</b>Timeout for stalled connection", "value": 15, "category": "verbose" }, |
︙ | ︙ | |||
98 99 100 101 102 103 104 | "config": [ { "name": "max", "arg": "-M", "type": "int", "description": "<b>-M</b> Maximum cumulative playing time", "value": 0 }, { "name": "loop", "arg": "-L", "type": "int", "description": "<b>-L</b> Maximum playlist loops", "value": 0 }, { "name": "retry", "arg": "-R", "type": "int", "description": "<b>-R</b> Maximum per-stream retries", "value": 0 }, { "name": "redir", "arg": "-l", "type": "int", "description": "<b>-l</b> Redirect follow limit", "value": 0 }, { "name": "fail", "arg": "-T", "type": "int", "description": "<b>-T</b> Wait time after failure", "value": 0 }, { "name": "daemon", "arg": "-i", "type": "int", "description": "<b>-i</b> Max network idle seconds", "value": 0 }, | | | | | | | | | | | < < < | > > > | | | | | 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 | "config": [ { "name": "max", "arg": "-M", "type": "int", "description": "<b>-M</b> Maximum cumulative playing time", "value": 0 }, { "name": "loop", "arg": "-L", "type": "int", "description": "<b>-L</b> Maximum playlist loops", "value": 0 }, { "name": "retry", "arg": "-R", "type": "int", "description": "<b>-R</b> Maximum per-stream retries", "value": 0 }, { "name": "redir", "arg": "-l", "type": "int", "description": "<b>-l</b> Redirect follow limit", "value": 0 }, { "name": "fail", "arg": "-T", "type": "int", "description": "<b>-T</b> Wait time after failure", "value": 0 }, { "name": "daemon", "arg": "-i", "type": "int", "description": "<b>-i</b> Max network idle seconds", "value": 0 }, { "name": "authfn", "arg": "-a", "type": "str", "description": "<b>-a</b> HTTP auth file (user:pass)", "value": "", "category": "extra" }, { "name": "verbose", "arg": "-v", "type": "bool", "description": "<b>-v</b> Verbose mode", "value": False, "category": "verbose" }, { "name": "daemon", "arg": "-d", "type": "str", "description": "<b>-d</b> Daemon mode: log file", "value": "", "category": "verbose" }, { "name": "ficy", "arg": "-P", "type": "str", "description": "<b>-P</b> Path to fIcy", "value": "", "category": "extra" }, ] }, "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": "<b>-f</b> Format", "value": "b" }, { "name": "c", "arg": "-c", "type": "bool", "description": "<b>-c</b> Continue partial downloads ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ... ", "value": True }, { "name": "netrc", "arg": "-n", "type": "bool", "description": "<b>-n</b> Use .netrc for auth/login", "value": False, "category": "extra" }, { "name": "ignore", "arg": "-i", "type": "bool", "description": "<b>-i</b> Ignore errors", "value": False }, { "name": "proxy", "arg": "--proxy", "type": "str", "description": "<b>-p</b> Proxy", "value": "", "category": "extra" }, { "name": "verbose", "arg": "-v", "type": "bool", "description": "<b>-v</b> Verbose mode", "value": False, "category": "verbose" }, { "name": "ipv4", "arg": "-4", "type": "bool", "description": "<b>-4</b> Use IPv4", "value": False, "category": "extra" }, { "name": "ipv6", "arg": "-6", "type": "bool", "description": "<b>-6</b> Use IPv6", "value": False, "category": "extra" }, ] }, "wget": { "title": "wget", "priority": "required", "type": "app", "category": "download", "version": "1.15", "description": "HTTP download utility", "config": [ { "name": "c", "arg": "-c", "type": "bool", "description": "<b>-c</b> Continue partial downloads.", "value": True }, { "name":"nc", "arg":"-nc", "type": "bool", "description": "<b>-nc</b> No-clobber, keep existing files.", "value": False }, { "name": "N", "arg": "-N", "type": "bool", "description": "<b>-N</b> Only fetch newer files", "value": False }, { "name": "O", "arg": "-O", "type": "str", "description": "<b>-O</b> Output to file", "value": "" }, { "name": "v", "arg": "-v", "type": "bool", "description": "<b>-v</b> Verbose mode", "value": False, "category": "verbose" }, { "name": "S", "arg": "-S", "type": "bool", "description": "<b>-S</b> Show response headers", "value": False, "category": "verbose" }, { "name": "U", "arg": "-U", "type": "str", "description": "<b>-U</b> Useragent to send", "value": "", "category": "extra" }, ] }, } # 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" # parameters from current action.record() call k = [] # avoids having to pass them around kw = {} # simplifies gtk callbacks row = {} # only one active instance anyway # hooks for user interface/handlers def init2(self, parent, *k, **kw): # TEMPORARY WORKAROUND: swap action.record() action.record = self.action_hook # BETTER APPROACH: hook record button #parent.on_record_clicked = self.show_window # default widget actions parent.win_recordoptions.connect("delete-event", self.hide_dialog) parent.recordoptions_go.connect("clicked", self.do_record) parent.recordoptions_save.connect("clicked", self.save_only) 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.cfg_vbox = { "basic": self.parent.recordoptions_cfg, "extra": self.parent.recordoptions_cfg_extra, "verbose": self.parent.recordoptions_cfg_verbose, } # add menu entry (for simple triv#1 option) #uikit.add_menu([parent.extensions_context], "Set single MP3 record -A flag", self.set_cont) # prepares a few shortcuts def map_app_args(self, app): config = self.flag_meta[app]["config"] self.argmap = { row["arg"].split(" ")[0]: 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" # override GtkWindow.destroy/delete-event def hide_dialog(self, *x): self.parent.win_recordoptions.hide() return True # hook for action.record def action_hook(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[conf.recordflags_row].strip() |
︙ | ︙ | |||
298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | # 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, "", 0, "0", default): continue arg = self.namemap[name] s = s + " " + arg if isinstance(val, (str, unicode)): # type == "bool" check here(...) s = s + " " + val return s | > | 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 | # 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 # ToDo: differentiate `-A -a β¦` and `-A` only #-- 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, "", 0, "0", default): continue arg = self.namemap[name] s = s + " " + arg if isinstance(val, (str, unicode)): # type == "bool" check here(...) s = s + " " + val return s |