diff -pruN 1.4-1/CHANGELOG 1.5-1/CHANGELOG --- 1.4-1/CHANGELOG 2018-04-04 23:26:45.000000000 +0000 +++ 1.5-1/CHANGELOG 2018-09-10 16:13:41.000000000 +0000 @@ -1,3 +1,13 @@ +ddgr v1.5 +2018-09-10 + +What's in? +- Support xclip as a clipboard utility on *nix +- Support GNU Screen and tmux as clipboard fallback +- Support Termux clipboard on Android + +------------------------------------------------------------------------------- + ddgr v1.4 2018-04-05 diff -pruN 1.4-1/ddgr 1.5-1/ddgr --- 1.4-1/ddgr 2018-04-04 23:26:45.000000000 +0000 +++ 1.5-1/ddgr 2018-09-10 16:13:41.000000000 +0000 @@ -55,7 +55,7 @@ signal.signal(signal.SIGINT, sigint_hand # Constants -_VERSION_ = '1.4' +_VERSION_ = '1.5' COLORMAP = {k: '\x1b[%sm' % v for k, v in { 'a': '30', 'b': '31', 'c': '32', 'd': '33', @@ -524,24 +524,14 @@ class DdgConnection(object): ------ DDGConnectionError - Attributes - ---------- - host : str - The currently connected host. Read-only property. Use - `new_connection` to change host. - Methods ------- fetch_page(url) """ - def __init__(self, host, port=None, timeout=45, proxy=None): + def __init__(self, proxy=None): self._u = 'https://duckduckgo.com/html' - self._host = None - self._port = None - self._conn = None - self.cookie = '' self._proxies = { 'https': proxy if proxy is not None else (os.getenv('https_proxy') @@ -549,11 +539,6 @@ class DdgConnection(object): else os.getenv('HTTPS_PROXY')) } - @property - def host(self): - """The host currently connected to.""" - return self._host - def fetch_page(self, url): """Fetch a URL. @@ -1172,7 +1157,7 @@ class DdgCmd(object): self._ddg_url = DdgUrl(opts) proxy = opts.proxy if hasattr(opts, 'proxy') else None - self._conn = DdgConnection(self._ddg_url.hostname, proxy=proxy) + self._conn = DdgConnection(proxy=proxy) self.results = [] self._urltable = {} @@ -1517,24 +1502,48 @@ class DdgCmd(object): elif cmd.startswith('c ') and cmd[2:].isdigit(): try: # try copying the url to clipboard using native utilities + copier_params = [] + copier_mode = 'stdin' if sys.platform.startswith(('linux', 'freebsd', 'openbsd')): - if shutil.which('xsel') is None: - raise FileNotFoundError - copier_params = ['xsel', '-b', '-i'] + if shutil.which('xsel') is not None: + copier_params = ['xsel', '-b', '-i'] + elif shutil.which('xclip') is not None: + copier_params = ['xclip', '-selection', 'clipboard'] + # If we're using Termux (Android) use its 'termux-api' + # add-on to set device clipboard. + elif shutil.which('termux-clipboard-set') is not None: + copier_params = ['termux-clipboard-set'] elif sys.platform == 'darwin': copier_params = ['pbcopy'] elif sys.platform == 'win32': copier_params = ['clip'] - else: - copier_params = [] + + # If native clipboard utilities are absent, try to use terminal + # multiplexers, tmux/GNU screen, as fallback. + if not copier_params: + if os.getenv('TMUX_PANE'): + copier_params = ['tmux', 'set-buffer'] + copier_mode = 'cmdline_arg' + elif os.getenv('STY'): + copier_params = ['screen', '-X', 'readbuf'] + copier_mode = 'ext_file' if not copier_params: - printerr('operating system not identified') + printerr('failed to locate suitable clipboard utility') else: - Popen(copier_params, stdin=PIPE, stdout=DEVNULL, - stderr=DEVNULL).communicate(self._urltable[cmd[2:]].encode('utf-8')) - except FileNotFoundError: - printerr('xsel missing') + content = self._urltable[cmd[2:]].encode('utf-8') + if copier_mode is 'stdin': + Popen(copier_params, stdin=PIPE, + stdout=DEVNULL, stderr=DEVNULL).communicate(content) + elif copier_mode == 'cmdline_arg': + Popen(copier_params + [content], stdin=DEVNULL, stdout=DEVNULL, + stderr=DEVNULL).communicate() + print('URL copied to tmux buffer.') + else: + with open('/tmp/screen-exchange', 'wb') as f: + f.write(content) + Popen(copier_params, stdin=DEVNULL, stdout=DEVNULL, + stderr=DEVNULL).communicate() except Exception: raise NoKeywordsException else: @@ -1657,7 +1666,8 @@ def completer_fetch_completions(prefix): # One can pass the 'hl' query param to specify the language. We # ignore that for now. - api_url = ('https://duckduckgo.com/ac/?q=%s&kl=wt-wt' % prefix) + api_url = ('https://duckduckgo.com/ac/?q=%s&kl=wt-wt' % + urllib.parse.quote(prefix, safe='')) # A timeout of 3 seconds seems to be overly generous already. resp = urllib.request.urlopen(api_url, timeout=3) respobj = json.loads(resp.read().decode('utf-8')) diff -pruN 1.4-1/ddgr.1 1.5-1/ddgr.1 --- 1.4-1/ddgr.1 2018-04-04 23:26:45.000000000 +0000 +++ 1.5-1/ddgr.1 2018-09-10 16:13:41.000000000 +0000 @@ -1,4 +1,4 @@ -.TH "DDGR" "1" "05 Apr 2018" "Version 1.4" "User Commands" +.TH "DDGR" "1" "10 Sep 2018" "Version 1.5" "User Commands" .SH NAME ddgr \- DuckDuckGo from the terminal .SH SYNOPSIS diff -pruN 1.4-1/debian/changelog 1.5-1/debian/changelog --- 1.4-1/debian/changelog 2018-04-05 15:52:29.000000000 +0000 +++ 1.5-1/debian/changelog 2018-09-11 01:57:09.000000000 +0000 @@ -1,3 +1,15 @@ +ddgr (1.5-1) unstable; urgency=medium + + * Import New upstream version + * Add upstream metadata + * d/control: + - Bump Standards-Version to 4.2.1 + - Bump python3 minimal requirement to 3.5 + * d/rules: + - Add override_dh_missing target (--fail-missing) + + -- SZ Lin (林上智) Tue, 11 Sep 2018 09:57:09 +0800 + ddgr (1.4-1) unstable; urgency=medium * Import New upstream version diff -pruN 1.4-1/debian/control 1.5-1/debian/control --- 1.4-1/debian/control 2018-04-05 15:50:09.000000000 +0000 +++ 1.5-1/debian/control 2018-09-11 01:53:16.000000000 +0000 @@ -3,10 +3,10 @@ Section: misc Priority: optional Maintainer: SZ Lin (林上智) Build-Depends: debhelper (>= 11), - python3 (>= 3.4), + python3 (>= 3.5), dh-python -X-Python3-Version: >= 3.4 -Standards-Version: 4.1.3 +X-Python3-Version: >= 3.5 +Standards-Version: 4.2.1 Homepage: https://github.com/jarun/ddgr Vcs-Git: https://salsa.debian.org/debian/ddgr.git Vcs-Browser: https://salsa.debian.org/debian/ddgr @@ -14,7 +14,7 @@ Vcs-Browser: https://salsa.debian.org/de Package: ddgr Architecture: all Depends: ${misc:Depends}, ${python3:Depends}, - python3 (>= 3.4) + python3 (>= 3.5) Description: DuckDuckGo from the terminal Features . diff -pruN 1.4-1/debian/rules 1.5-1/debian/rules --- 1.4-1/debian/rules 2018-04-05 15:52:00.000000000 +0000 +++ 1.5-1/debian/rules 2018-09-11 01:48:34.000000000 +0000 @@ -4,3 +4,5 @@ override_dh_usrlocal: +override_dh_missing: + dh_missing --fail-missing diff -pruN 1.4-1/debian/upstream/metadata 1.5-1/debian/upstream/metadata --- 1.4-1/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ 1.5-1/debian/upstream/metadata 2018-09-11 01:56:55.000000000 +0000 @@ -0,0 +1,5 @@ +Reference: + Author: Arun Prakash Jana + Name: DuckDuckGo from the terminal + Year: 2017 + URL: https://github.com/jarun/ddgr diff -pruN 1.4-1/packagecore.yaml 1.5-1/packagecore.yaml --- 1.4-1/packagecore.yaml 2018-04-04 23:26:45.000000000 +0000 +++ 1.5-1/packagecore.yaml 2018-09-10 16:13:41.000000000 +0000 @@ -20,6 +20,14 @@ packages: commands: pre: - yum install epel-release + centos7.4: + builddeps: + - make + deps: + - python + commands: + pre: + - yum install epel-release debian9: builddeps: - make @@ -35,6 +43,11 @@ packages: - make deps: - python3 + fedora28: + builddeps: + - make + deps: + - python3 opensuse42.2: builddeps: - make @@ -50,7 +63,7 @@ packages: - make deps: - python3 - ubuntu17.10: + ubuntu18.04: builddeps: - make deps: diff -pruN 1.4-1/README.md 1.5-1/README.md --- 1.4-1/README.md 2018-04-04 23:26:45.000000000 +0000 +++ 1.5-1/README.md 2018-09-10 16:13:41.000000000 +0000 @@ -19,13 +19,15 @@ Asciicast

-`ddgr` is a cmdline utility to search DuckDuckGo from the terminal. While [`googler`](https://github.com/jarun/googler) is highly popular among cmdline users, in many forums the need of a similar utility for privacy-aware DuckDuckGo came up. [DuckDuckGo Bangs](https://duckduckgo.com/bang) are super-cool too! So here's `ddgr` for you! +`ddgr` is a cmdline utility to search DuckDuckGo from the terminal. While [googler](https://github.com/jarun/googler) is highly popular among cmdline users, in many forums the need of a similar utility for privacy-aware DuckDuckGo came up. [DuckDuckGo Bangs](https://duckduckgo.com/bang) are super-cool too! So here's `ddgr` for you! Unlike the web interface, you can specify the number of search results you would like to see per page. It's more convenient than skimming through 30-odd search results per page. The default interface is carefully designed to use minimum space without sacrificing readability. +A big advantage of `ddgr` over `googler` is DuckDuckGo works over the Tor network. + `ddgr` isn't affiliated to DuckDuckGo in any way. -*Love smart and efficient terminal utilities? Explore my repositories. Buy me a cup of coffee if they help you.* +*Love smart and efficient utilities? Explore [my repositories](https://github.com/jarun?tab=repositories). Buy me a cup of coffee if they help you.*

@@ -75,13 +77,13 @@ Unlike the web interface, you can specif `ddgr` requires Python 3.4 or later. Only the latest patch release of each minor version is supported. -To copy url to clipboard at the omniprompt, `ddgr` uses `xsel` on Linux, `pbcopy` (default installed) on OS X and `clip` (default installed) on Windows. +To copy url to clipboard at the omniprompt, `ddgr` looks for `xsel` or `xclip` or `termux-clipboard-set` (in the same order) on Linux, `pbcopy` (default installed) on OS X and `clip` (default installed) on Windows. Note: v1.1 and below require the Python3 `requests` library to make HTTPS requests. This dependency is removed in the later releases. #### From a package manager -- [AUR](https://aur.archlinux.org/packages/ddgr/) (`pacman -S ddgr`) +- [AUR](https://aur.archlinux.org/packages/ddgr/) (`yaourt -S ddgr`) - [Debian](https://packages.debian.org/search?keywords=ddgr&searchon=names&exact=1) (`apt-get install ddgr`) - [Fedora](https://apps.fedoraproject.org/packages/ddgr) (`dnf install ddgr`) - [FreeBSD](https://www.freshports.org/www/ddgr/) (`pkg install ddgr`) @@ -115,7 +117,7 @@ To remove `ddgr` and associated docs, ru #### Running standalone -`ddgr` is a standalone executable. From the containing directory: +`ddgr` is a standalone executable (and can run even on environments like Termux). From the containing directory: $ ./ddgr diff -pruN 1.4-1/.travis.yml 1.5-1/.travis.yml --- 1.4-1/.travis.yml 2018-04-04 23:26:45.000000000 +0000 +++ 1.5-1/.travis.yml 2018-09-10 16:13:41.000000000 +0000 @@ -1,12 +1,12 @@ language: python python: - - "3.4" - "3.5" - "3.6" + - "3.7" sudo: required services: - docker -dist: trusty +dist: xenial before_install: - "pip install --upgrade setuptools" - "pip install --upgrade pip"