diff --git a/Azot/config.py b/Azot/config.py index edd0fca..63d1d25 100644 --- a/Azot/config.py +++ b/Azot/config.py @@ -2,16 +2,29 @@ import ast import argparse import os from Azot.X import get_geometry +from Azot.logger import info # Globals -config_path = os.environ['HOME'] + '/.config/azot/config.json' +config_dir = os.environ['HOME'] + '/.config/azot/' +config_path = config_dir + "config.json" + +default_config_paths = ['/usr/share/doc/azot/config.sample.json', './config.sample.json'] parser = argparse.ArgumentParser() parser.add_argument('-c', '--config') args = parser.parse_args() if args.config: - config_path = args.config + config_path = args.config +# Check config existence and copy if needed +if not os.path.exists(config_path): + for default_path in default_config_paths: + if os.path.exists(default_path): + os.makedirs(config_dir) + import shutil + info("Config doesn't exist in " + config_path + "; copying...") + shutil.copyfile(default_path, config_path) + break # Load configuration from file def load(): @@ -19,7 +32,7 @@ def load(): with open(config_path) as config_file: for line in config_file: config += line - + config_file.close() config = ast.literal_eval(config) config['corners'] = get_middle_areas() @@ -40,7 +53,7 @@ def get_middle_areas(): middle_y_start = int( middle_y - middle_y_area_pixels ) middle_x_end = int( middle_x + middle_x_area_pixels ) middle_y_end = int( middle_y + middle_y_area_pixels ) - + corners = { 'left_corner': 0, 'right_corner': geometry['x'] - 1, 'top_corner': 0, @@ -51,5 +64,4 @@ def get_middle_areas(): 'middle_y_end': middle_y_end } - return corners - + return corners \ No newline at end of file diff --git a/Azot/logger.py b/Azot/logger.py index 76b14c9..9db389e 100644 --- a/Azot/logger.py +++ b/Azot/logger.py @@ -1,4 +1,3 @@ -from __future__ import print_function import sys @@ -9,4 +8,4 @@ def warning(msg): # Print to STDOUT def info(msg): - print("INFO: ", msg, file=sys.stdout) + print("INFO: ", msg, file=sys.stdout) \ No newline at end of file diff --git a/README.md b/README.md index 2369a95..ca44451 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ It's look like KWin or Compiz, e.t.c ## Configuration -Edit config.sample.json and put it into ~/.config/azot/config.json +By default it's stored in ~/.config/azot/config.json * type must be ''exec'', ''notify'' or ''simple'' * exec: just show command diff --git a/azot.py b/azot.py index 94b7eb8..ebe8472 100755 --- a/azot.py +++ b/azot.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python3 import Azot.action diff --git a/azot.spec b/azot.spec index 989ec3d..603a5bf 100644 --- a/azot.spec +++ b/azot.spec @@ -23,7 +23,7 @@ rm -rf $RPM_BUILD_ROOT rm -f *.pyc rm -f Azot/*.pyc -mkdir -p $RPM_BUILD_ROOT/usr/lib/python2.7/site-packages/Azot/ +mkdir -p $RPM_BUILD_ROOT/usr/lib/python3.4/site-packages/Azot/ mkdir -p $RPM_BUILD_ROOT/usr/share/doc/azot/ mkdir -p $RPM_BUILD_ROOT/usr/bin/ @@ -31,7 +31,7 @@ cp README.md $RPM_BUILD_ROOT/usr/share/doc/azot cp LICENSE $RPM_BUILD_ROOT/usr/share/doc/azot cp config.sample.json $RPM_BUILD_ROOT/usr/share/doc/azot cp azot.py $RPM_BUILD_ROOT/usr/bin/ -cp azot/* $RPM_BUILD_ROOT/usr/lib/python2.7/site-packages/Azot/ +cp azot/* $RPM_BUILD_ROOT/usr/lib/python3.4/site-packages/Azot/ %{_fixperms} $RPM_BUILD_ROOT/* @@ -40,21 +40,21 @@ rm -rf $RPM_BUILD_ROOT %files /usr/bin/azot.py -/usr/lib/python2.7/site-packages/Azot/X.py -/usr/lib/python2.7/site-packages/Azot/X.pyc -/usr/lib/python2.7/site-packages/Azot/X.pyo -/usr/lib/python2.7/site-packages/Azot/__init__.py -/usr/lib/python2.7/site-packages/Azot/__init__.pyc -/usr/lib/python2.7/site-packages/Azot/__init__.pyo -/usr/lib/python2.7/site-packages/Azot/action.py -/usr/lib/python2.7/site-packages/Azot/action.pyc -/usr/lib/python2.7/site-packages/Azot/action.pyo -/usr/lib/python2.7/site-packages/Azot/config.py -/usr/lib/python2.7/site-packages/Azot/config.pyc -/usr/lib/python2.7/site-packages/Azot/config.pyo -/usr/lib/python2.7/site-packages/Azot/logger.py -/usr/lib/python2.7/site-packages/Azot/logger.pyc -/usr/lib/python2.7/site-packages/Azot/logger.pyo +/usr/lib/python3.4/site-packages/Azot/X.py +/usr/lib/python3.4/site-packages/Azot/X.pyc +/usr/lib/python3.4/site-packages/Azot/X.pyo +/usr/lib/python3.4/site-packages/Azot/__init__.py +/usr/lib/python3.4/site-packages/Azot/__init__.pyc +/usr/lib/python3.4/site-packages/Azot/__init__.pyo +/usr/lib/python3.4/site-packages/Azot/action.py +/usr/lib/python3.4/site-packages/Azot/action.pyc +/usr/lib/python3.4/site-packages/Azot/action.pyo +/usr/lib/python3.4/site-packages/Azot/config.py +/usr/lib/python3.4/site-packages/Azot/config.pyc +/usr/lib/python3.4/site-packages/Azot/config.pyo +/usr/lib/python3.4/site-packages/Azot/logger.py +/usr/lib/python3.4/site-packages/Azot/logger.pyc +/usr/lib/python3.4/site-packages/Azot/logger.pyo %defattr(-,root,root,-) %doc LICENSE README.md config.sample.json diff --git a/debian/control b/debian/control index 5d6d13b..995c92e 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Vcs-Git: https://github.com/Difrex/azot Package: azot Architecture: all -Depends: python, python-xlib, libnotify-bin +Depends: python3, python3-xlib, libnotify-bin Description: Screen corners action in all WMs Package: azot-docs diff --git a/debian/install b/debian/install index aa4c747..7105d97 100644 --- a/debian/install +++ b/debian/install @@ -1,6 +1,6 @@ -Azot/action.py usr/lib/python2.7/dist-packages/Azot -Azot/logger.py usr/lib/python2.7/dist-packages/Azot -Azot/config.py usr/lib/python2.7/dist-packages/Azot -Azot/X.py usr/lib/python2.7/dist-packages/Azot -Azot/__init__.py usr/lib/python2.7/dist-packages/Azot -azot.py usr/bin +Azot/action.py usr/lib/python3.4/dist-packages/Azot +Azot/logger.py usr/lib/python3.4/dist-packages/Azot +Azot/config.py usr/lib/python3.4/dist-packages/Azot +Azot/X.py usr/lib/python3.4/dist-packages/Azot +Azot/__init__.py usr/lib/python3.4/dist-packages/Azot +azot.py usr/bin \ No newline at end of file