Merge pull request #125 from deviantfero/new-templates

New template format
deviantfero · Feb 11, 2019 · 5a7dc23 · 5a7dc23
2 parents 4fa6663 + 1f15384
commit 5a7dc23
Show file tree

Hide file tree

Showing 14 changed files with 368 additions and 245 deletions.
diff --git a/completions/bash/wpg b/completions/bash/wpg
@@ -1,25 +1,25 @@
 function _wpg() {
-    local optforprofiles
+    local optforcolorschemes
     _get_comp_words_by_ref cur
     # themes
-    optforprofiles="-s -e -d -z -m -LA -A --brt --sat"
+    optforcolorschemes="-s -e -d -z -m -LA -A --brt --sat -R"
     # themes, pywal themes
 	optforvariabletheme="-Ti"
     # themes, filenames
     optvariable="-i -o"
 	# filenames
-    optfordefault="-y -a -xa -ax"
+    optfordefault="--link -aL -La -a -ta -at --update"
 	# templates
-    optfortemplates="-xd -dx"
+    optfortemplates="-td -dt"
 	# pywal backends
 	optforbackends="--backends"
 	# pywal themes
-	optforthemes="--pywal"
+	optforthemes="--theme"
 
     if [[ $COMP_CWORD = 1 ]]; then
         COMPREPLY=($(compgen -W "$(_parse_usage wpg)" -- "$cur"))
     elif [[ $COMP_CWORD < 4 || ${COMP_WORDS[1]} != "-s" ]]; then
-        for opt in $optforprofiles; do
+        for opt in $optforcolorschemes; do
             if [[ $opt = ${COMP_WORDS[1]} ]]; then
                 COMPREPLY=($(compgen -W "$(wpg -l)" -- "$cur"))
             fi
@@ -31,7 +31,7 @@ function _wpg() {
         done
         for opt in $optforthemes; do
             if [[ $opt = ${COMP_WORDS[1]} ]]; then
-                COMPREPLY=($(compgen -W "$(wpg --pywal)" -- "$cur"))
+                COMPREPLY=($(compgen -W "$(wpg --theme)" -- "$cur"))
             fi
         done
         for opt in $optvariable; do
@@ -45,7 +45,7 @@ function _wpg() {
             if [[ $opt = ${COMP_WORDS[1]} && $COMP_CWORD < 3 ]]; then
                 COMPREPLY=($(compgen -W "$(wpg -l)" -- "$cur"))
             elif [[ $opt = ${COMP_WORDS[1]} ]]; then
-                COMPREPLY=($(compgen -W "$(wpg --pywal)" -- "$cur"))
+                COMPREPLY=($(compgen -W "$(wpg --theme)" -- "$cur"))
             fi
         done
         for opt in $optfordefault; do
@@ -55,7 +55,7 @@ function _wpg() {
         done
         for opt in $optfortemplates; do
             if [[ $opt = ${COMP_WORDS[1]} ]]; then
-                COMPREPLY=($(compgen -W "$(wpg -xl)" -- "$cur"))
+                COMPREPLY=($(compgen -W "$(wpg -tl)" -- "$cur"))
             fi
         done
     fi

diff --git a/completions/zsh/_wpg b/completions/zsh/_wpg
@@ -1,15 +1,15 @@
 #compdef wpg
 
-_profiles() {
-    local -a profiles
-    profiles=(`wpg -l`)
-    _describe 'profiles' profiles
+_colorschemes() {
+    local -a colorschemes
+    colorschemes=(`wpg -l`)
+    _describe 'colorschemes' colorschemes
 }
 
 _templates() {
-    local -a templates
-    templates=(`wpg -xl`)
-    _describe 'templates' templates
+	local -a templates
+	templates=(`wpg -tl`)
+	_describe 'templates' templates
 }
 
 _backends() {
@@ -20,52 +20,52 @@ _backends() {
 
 _themes() {
     local -a themes
-    themes=(`wpg --pywal`)
+    themes=(`wpg --theme`)
     _describe 'themes' themes
 }
 
 _wpg() {
-    local state optforprofiles
+    local state optforcolorschemes
     # themes
-    optforprofiles=(-s -e -d -z -m -A -LA --brt --sat) 
+    optforcolorschemes=(-s -e -d -z -m -A -LA --brt --sat -R)
     # themes, filenames
     optvariable=(-i -o)
     # themes, pywal themes
     optvariabletheme=(-Ti)
     # filenames
-    optforgeneric=(-y -a -xa)
+    optforgeneric=(--link -a -La -aL -ta -at --update)
     # templates
-    optfortemplates=(-xd -dx)
+    optfortemplates=(-td -dt)
     # pywal backends
     optforbackends=(--backend)
     # pywal themes
-    optforthemes=(--pywal)
+    optforthemes=(--theme)
 
     _arguments \
         '1: :->generic' \
-        '*: :->listprofiles'
+        '*: :->listcolorschemes'
 
     case $state in
         (generic)
             _gnu_generic
             ;;
-        (listprofiles)
+        (listcolorschemes)
             if [[ $CURRENT < 5 || ${words[2]} != "-s" ]]; then
-                for opt in $optforprofiles; do
+                for opt in $optforcolorschemes; do
                     if [[ $opt = ${words[2]} ]]; then
-                        _profiles
+                        _colorschemes
                     fi
                 done
                 for opt in $optvariable; do
                     if [[ $opt = ${words[2]} && $CURRENT < 4 ]]; then
-                        _profiles
+                        _colorschemes
                     elif [[ $opt = ${words[2]} ]]; then
                         _gnu_generic
                     fi
                 done
                 for opt in $optvariabletheme; do
                     if [[ $opt = ${words[2]} && $CURRENT < 4 ]]; then
-                        _profiles
+                        _colorschemes
                     elif [[ $opt = ${words[2]} ]]; then
                         _themes
                     fi
@@ -90,9 +90,9 @@ _wpg() {
                         _themes
                     fi
                 done
-            fi 
-            ;;
-    esac
+			fi 
+			;;
+	esac
 }
 
 _wpg "$@"
diff --git a/setup.py b/setup.py
@@ -44,7 +44,7 @@
     python_requires=">=3.5",
     install_requires=[
         'Pillow>=4.2.1',
-        'pywal>=2.0.0',
+        'pywal>=3.0.0',
     ],
     include_package_data=True,
     data_files=[('etc/wpgtk', ['wpgtk/misc/wpg.conf']),