From 068f4b504e0e0454af1a325939f9ac386016ba62 Mon Sep 17 00:00:00 2001 From: Victor Häggqvist Date: Tue, 2 Sep 2014 22:29:48 +0200 Subject: filter uniqe items and blacklist --- etc/config | 5 +++-- setup.py | 11 ++++++----- xboomx/bin/xboomx | 2 -- xboomx/bin/xboomx_path.py | 22 +++++++++++++++++----- 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/etc/config b/etc/config index 15eb62e..332122d 100644 --- a/etc/config +++ b/etc/config @@ -1,3 +1,4 @@ { - "dmenu_params": "-i -nb black -nf orange -sb black -p \"#\"" -} \ No newline at end of file + "dmenu_params": "-b -i -nb black -nf orange -sb black -p \"#\"", + "ignorelist": ["X"] +} diff --git a/setup.py b/setup.py index fe1a6c3..8acc2e3 100644 --- a/setup.py +++ b/setup.py @@ -1,9 +1,10 @@ +# -*- coding: utf-8 -*- from setuptools import setup setup( name='xboomx', - version='0.50', + version='0.60', packages=['xboomx'], scripts=['xboomx/bin/xboomx_path.py', 'xboomx/bin/xboomx_sort.py', @@ -11,12 +12,12 @@ setup( 'xboomx/bin/xboomx_urls.py', 'xboomx/bin/web_xboomx', 'xboomx/bin/xboomx'], - license='BSD', + license='GPLv2', long_description='wrapper for most common occurences in dmenu', install_requires=[], include_package_data=True, package_data={'shared': ["etc/config"]}, - author="Yuriy Netesov", - author_email="retnuhed@gmail.com", - url="https://bitbucket.org/dehun/xboomx/", + author="Victor Häggqvist", + author_email="victor@hggqvst.com", + url="https://github.com/victorhaggqvist/xboomx", ) diff --git a/xboomx/bin/xboomx b/xboomx/bin/xboomx index 2b4d266..c8865dc 100755 --- a/xboomx/bin/xboomx +++ b/xboomx/bin/xboomx @@ -1,6 +1,4 @@ #!/usr/bin/python -import fileinput - import subprocess from xboomx.config import config import xboomx.db diff --git a/xboomx/bin/xboomx_path.py b/xboomx/bin/xboomx_path.py index 67a1cb1..56779b3 100755 --- a/xboomx/bin/xboomx_path.py +++ b/xboomx/bin/xboomx_path.py @@ -1,11 +1,23 @@ #!/usr/bin/python import os +from xboomx.config import config -pathes = os.environ['PATH'].split(':') +def main(): + pathes = os.environ['PATH'].split(':') + items = [] -for path in pathes: - if os.path.isdir(path): - for f in os.listdir(path): - print f + for path in pathes: + if os.path.isdir(path): + for f in os.listdir(path): + items.append(f) + + uniqeitems = list(set(items)) + + ignorelist = config.get("ignorelist",""); + for item in uniqeitems: + if item not in ignorelist: + print item + +main() \ No newline at end of file -- cgit v1.2.3