diff --git a/Facemoviefier.py b/Facemoviefier similarity index 99% rename from Facemoviefier.py rename to Facemoviefier index 888f673..b75ad19 100644 --- a/Facemoviefier.py +++ b/Facemoviefier @@ -1,3 +1,4 @@ +#!/usr/bin/env python """ .. module:: FaceMovifier :platform: Unix, Windows diff --git a/Ivolution.py b/Ivolution similarity index 100% rename from Ivolution.py rename to Ivolution diff --git a/ivolution/data/haarcascades/__init__.py b/ivolution/data/haarcascades/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/ivolution/data/media/__init__.py b/ivolution/data/media/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/ivolution/data/samples/__init__.py b/ivolution/data/samples/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/ivolution/data/ui/__init__.py b/ivolution/data/ui/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/ivolution/gui/IvolutionWindow.py b/ivolution/gui/IvolutionWindow.py index fadd3db..6e3a55f 100755 --- a/ivolution/gui/IvolutionWindow.py +++ b/ivolution/gui/IvolutionWindow.py @@ -192,15 +192,18 @@ class IvolutionWindow(FacemovieThread.Observer, FacemovieThread.Observable): Configures our logger to save error messages Start logging in file here """ + personal_dir = "~/.ivolution" + log_root = 'fm.log' + log_file = os.path.join(os.path.expanduser(personal_dir),log_root) + # create logger for 'facemovie' - #self.my_logger = logging.getLogger('FileLog') - self.my_logger = logging.getLogger('ConsoleLog') + self.my_logger = logging.getLogger('FileLog') self.my_logger.setLevel(logging.DEBUG) # create file handler which logs even debug messages - fh = logging.StreamHandler() - #fh = logging.FileHandler('log/fm.log') + #fh = logging.StreamHandler() + fh = logging.FileHandler(log_file) fh.setLevel(logging.DEBUG) # create console handler with a higher log level diff --git a/setup.py b/setup.py index 84561ae..ccf0409 100644 --- a/setup.py +++ b/setup.py @@ -7,10 +7,28 @@ Created on 19 avr. 2012 from distutils.core import setup import os +personal_dir = "~/.ivolution" + # Utility function to read the README file. def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() +def create_personal(): + # creating personal folder + if not os.path.exists(os.path.expanduser(personal_dir)): + print os.path.expanduser(personal_dir) + os.makedirs(os.path.expanduser(personal_dir)) + + # creating personal file + log_root = 'fm.log' + log_file = os.path.join(os.path.expanduser(personal_dir),log_root) + if not os.path.exists(log_file): + print log_file + open(log_file, 'w').close() + + os.chmod(log_file, 02777) # allow read write access + + setup( name = "Ivolution", version = "1.0", @@ -34,8 +52,9 @@ setup( "Programming Language :: Python :: 2 :: Only", ], #data_files = data_files, - scripts=['Ivolution.py', 'Facemoviefier.py'], + scripts=['Ivolution', 'Facemoviefier'], package_dir={'ivolution.data' : 'ivolution/data'}, - #package_data={'ivolution.data' : ['haarcascades/*'], 'ivolution.data' : ['samples/*'], 'ivolution.data' : ['ui/*'], 'ivolution.media' : ['media/*']} - package_data={'ivolution.data' : ['haarcascades/*', 'samples/*', 'ui/*', 'media/*']} + package_data={'ivolution.data' : ['haarcascades/*', 'samples/*', 'ui/*', 'media/*']}, ) + +create_personal()