Add copyright headers & clean-up

diff --git a/sima/client.py b/sima/client.py
index 6cd3802396688a01bc683318815d5e40aedb6a54..ff6ca38197624edddcb212b30d975c3bfb500e8f 100644 (file)
--- a/sima/client.py
+++ b/sima/client.py
@@ -1,4 +1,22 @@
-# -* coding: utf-8 -*-
+# -*- coding: utf-8 -*-
+# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """MPD client for Sima
 
 This client is built above python-musicpd a fork of python-mpd

diff --git a/sima/core.py b/sima/core.py
index 8e075b0a28ace0a7078ee87b98083d4c38454c50..d7a61369a38971634174483fb156a5eb2b85c37f 100644 (file)
--- a/sima/core.py
+++ b/sima/core.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2009, 2010, 2011, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """Core Object dealing with plugins and player client
 """
 

diff --git a/sima/info.py b/sima/info.py
index 3b6d3698d3b70146a48ecfd5ee76b930ef112e8b..5bf5084e115ee7af58aba73349f765d509deff99 100644 (file)
--- a/sima/info.py
+++ b/sima/info.py
@@ -11,7 +11,7 @@ queue is getting short.
 """
 
 
-__version__ = '0.12.0pr2'
+__version__ = '0.12.0pr4'
 __author__ = 'kaliko jack'
 __email__ = 'kaliko@azylum.org'
 __url__ = 'git://git.kaliko.me/sima.git'

diff --git a/sima/launch.py b/sima/launch.py
index 24802bf043701648a3635a88db79eec2eda0e9b4..a25b31333672592c22b627f4f4d85ad1f8a57e91 100644 (file)
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """Sima
 """
 

diff --git a/sima/lib/logger.py b/sima/lib/logger.py
index 05c675eee49cb030f834da3ba2983bbdc1456fb3..a4ed23de4f2b9c5c985edb8ff03d6383577837d0 100644 (file)
--- a/sima/lib/logger.py
+++ b/sima/lib/logger.py
@@ -29,7 +29,7 @@ import sys
 
 
 LOG_FORMATS = {
-        logging.DEBUG:  '{asctime} {filename: >11}:{lineno: <3} {levelname: <5}: {message}',
+        logging.DEBUG:  '{asctime} {filename: >11}:{lineno: <3} {levelname: <7}: {message}',
         logging.INFO:  '{asctime} {levelname: <7}: {message}',
         #logging.DEBUG: '{asctime} {filename}:{lineno}({funcName}) '
                                  #'{levelname}: {message}',

diff --git a/sima/lib/player.py b/sima/lib/player.py
index 751e464ba7a3c551aabf3ff0dd2c974028fb3e82..ddba0a9bea46357e94ec2f5bc6a1ebef7b19f6fd 100644 (file)
--- a/sima/lib/player.py
+++ b/sima/lib/player.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2009-2014 Jack Kaliko <jack@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 
 # TODO:
 # Add decorator to filter through history?

diff --git a/sima/lib/simafm.py b/sima/lib/simafm.py
index 04ee37b915386413d6ccd24d00865df8c72b42fd..18625a6761bbc80c4aee7e060e90918193d0696a 100644 (file)
--- a/sima/lib/simafm.py
+++ b/sima/lib/simafm.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2014 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
 #
 #   This program is free software: you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -21,7 +21,7 @@
 Consume EchoNest web service
 """
 
-__version__ = '0.0.1'
+__version__ = '0.5.0'
 __author__ = 'Jack Kaliko'
 
 
@@ -38,7 +38,7 @@ if len(LFM.get('apikey')) == 43:  # simple hack allowing imp.reload
 
 # Some definitions
 WAIT_BETWEEN_REQUESTS = timedelta(0, 1)
-SOCKET_TIMEOUT = 4
+SOCKET_TIMEOUT = 6
 
 
 class SimaFM():

diff --git a/sima/lib/webservice.py b/sima/lib/webserv.py
similarity index 94%
rename from sima/lib/webservice.py
rename to sima/lib/webserv.py
index 0937bde348c9499cc46b4729833182a7ebe05c3e..cc4b2b5deb250245214bea798d5019f52e5dff4a 100644 (file)
--- a/sima/lib/webservice.py
+++ b/sima/lib/webserv.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """
 Fetching similar artists from last.fm web services
 """

diff --git a/sima/plugins/contrib/placeholder.py b/sima/plugins/contrib/placeholder.py
index 60e34b50f4c054326e643d9465fe59c98095e96b..f70474be084dcf86e385cdc518ecf37fc3474042 100644 (file)
--- a/sima/plugins/contrib/placeholder.py
+++ b/sima/plugins/contrib/placeholder.py
@@ -1,9 +1,26 @@
 # -*- coding: utf-8 -*-
-"""Crops playlist
+# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
+"""PlaceHolder
 """
 
 # standard library import
-#from select import select
 
 # third parties components
 

diff --git a/sima/plugins/core/history.py b/sima/plugins/core/history.py
index 67414a845f2a756e5f0314f9c1aee5be7b3891a8..b79105333a54dffe12841a9a19f0dc72a3fbabdd 100644 (file)
--- a/sima/plugins/core/history.py
+++ b/sima/plugins/core/history.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """Add playing tracks to history
 """
 

diff --git a/sima/plugins/core/mpdoptions.py b/sima/plugins/core/mpdoptions.py
index be47a40f94914aff65d81814042b4f005e6c75dc..1c4f8529a2861c1150f9421eca8e201bc54414f6 100644 (file)
--- a/sima/plugins/core/mpdoptions.py
+++ b/sima/plugins/core/mpdoptions.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """
     Deal with MPD options ‑ idle and repeat mode
 """

diff --git a/sima/plugins/internal/crop.py b/sima/plugins/internal/crop.py
index 2ecbfc10a61edc94eaeb40ae902afa321dd0bb1c..1f8ab2c1936f9d39cd0c898d7a40e0c1973859f5 100644 (file)
--- a/sima/plugins/internal/crop.py
+++ b/sima/plugins/internal/crop.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """Crops playlist
 """
 

diff --git a/sima/plugins/internal/echonest.py b/sima/plugins/internal/echonest.py
index 74dd2b8ae983f85551d2f27fa7ecc76b045173ca..7d4c0e041384a55d1c5097f3bde671adeb323008 100644 (file)
--- a/sima/plugins/internal/echonest.py
+++ b/sima/plugins/internal/echonest.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """
 Fetching similar artists from echonest web services
 """
@@ -9,7 +27,7 @@ Fetching similar artists from echonest web services
 
 # local import
 from ...lib.simaecho import SimaEch
-from ...lib.webservice import WebService
+from ...lib.webserv import WebService
 
 
 class EchoNest(WebService):

diff --git a/sima/plugins/internal/lastfm.py b/sima/plugins/internal/lastfm.py
index b4f56c2337e318e71162f9ab64bc180b40c81784..2e6fca6b7fdc3c008a41b650338050ae78643484 100644 (file)
--- a/sima/plugins/internal/lastfm.py
+++ b/sima/plugins/internal/lastfm.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """
 Fetching similar artists from last.fm web services
 """
@@ -9,7 +27,7 @@ Fetching similar artists from last.fm web services
 
 # local import
 from ...lib.simafm import SimaFM
-from ...lib.webservice import WebService
+from ...lib.webserv import WebService
 
 
 class Lastfm(WebService):

diff --git a/sima/plugins/internal/randomfallback.py b/sima/plugins/internal/randomfallback.py
index 07201c028a16378cc976018a66ca898364ad9177..12673de22c6489ccf5c850eb2a9495270a39f453 100644 (file)
--- a/sima/plugins/internal/randomfallback.py
+++ b/sima/plugins/internal/randomfallback.py
@@ -1,4 +1,22 @@
 # -*- coding: utf-8 -*-
+# Copyright (c) 2013, 2014 Jack Kaliko <kaliko@azylum.org>
+#
+#  This file is part of sima
+#
+#  sima is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  sima is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with sima.  If not, see <http://www.gnu.org/licenses/>.
+#
+#
 """
 Fetching similar artists from last.fm web services
 """

diff --git a/sima/utils/config.py b/sima/utils/config.py
index 99fb3227b7b69b18f085d513dcefcb99e608c67d..c425642679fd4063c4445a0a7e0b96bc37fb453b 100644 (file)
--- a/sima/utils/config.py
+++ b/sima/utils/config.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, 2010, 2011, 2013 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009, 2010, 2011, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #

diff --git a/sima/utils/leven.py b/sima/utils/leven.py
index adc48f78a39a4a2d82763d30d1183390f0e764cf..9b269df4357bc8db740a1f4777646e697a0966ab 100644 (file)
--- a/sima/utils/leven.py
+++ b/sima/utils/leven.py
@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-
 # Copyright (c) 2009, 2010, 2013 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima

diff --git a/sima/utils/startopt.py b/sima/utils/startopt.py
index 04df3b4b5f287351960a2efc50b4955e0fcbce65..33e89b1988291fba038a438c064e24972b8e076c 100644 (file)
--- a/sima/utils/startopt.py
+++ b/sima/utils/startopt.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2009, 2010, 2011, 2012, 2013 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #