Master cpasbien.py

.coveragerc

@@ -0,0 +1,11 @@
+[run]
+source=
+	./couchpotato/
+omit =
+	./libs/*
+	./node_modules/*
+[report]
+omit =
+	*/python?.?/*
+	./libs/*
+	./node_modules/*

.editorconfig

@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = tab
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.py]
+indent_style = space
+
+[*.md]
+trim_trailing_whitespace = false

.github/contributing.md

@@ -0,0 +1,40 @@
+# Contributing to CouchPotatoServer
+
+1. [Contributing](#contributing)
+2. [Submitting an Issue](#issues)
+3. [Submitting a Pull Request](#pull-requests)
+
+## Contributing
+Thank you for your interest in contributing to CouchPotato. There are several ways to help out, even if you've never worked on an open source project before.
+If you've found a bug or want to request a feature, you can report it by [posting an issue](https://github.com/CouchPotato/CouchPotatoServer/issues/new) - be sure to read the [guidelines](#issues) first!
+If you want to contribute your own work, please read the [guidelines](#pull-requests) for submitting a pull request.
+Lastly, for anything related to CouchPotato, feel free to stop by the [forum](http://couchpota.to/forum/) or the [#couchpotato](http://webchat.freenode.net/?channels=couchpotato) IRC channel at irc.freenode.net.
+
+## Issues
+Issues are intended for reporting bugs and weird behaviour or suggesting improvements to CouchPotatoServer.
+Before you submit an issue, please go through the following checklist:
+ * **FILL IN ALL THE FIELDS ASKED FOR**
+ * **POST MORE THAN A SINGLE LINE LOG**, if you do, you'd better have a easy reproducable bug
+ * Search through existing issues (*including closed issues!*) first: you might be able to get your answer there.
+ * Double check your issue manually, because it could be an external issue. 
+ * Post logs with your issue: Without seeing what is going on, the developers can't reproduce the error.
+ * Check the logs yourself before submitting them. Obvious errors like permission or HTTP errors are often not related to CouchPotato.
+ * What movie and quality are you searching for?
+ * What are your settings for the specific problem?
+ * What providers are you using? (While your logs include these, scanning through hundreds of lines of logs isn't our hobby)
+ * Post the logs from the *config* directory, please do not copy paste the UI. Use pastebin to store these logs!
+ * Give a short step by step of how to reproduce the error.
+ * What hardware / OS are you using and what are its limitations? For example: NAS can be slow and maybe have a different version of python installed than when you use CP on OS X or Windows.
+ * Your issue might be marked with the "can't reproduce" tag. Don't ask why your issue was closed if it says so in the tag.
+ * If you're running on a NAS (QNAP, Austor, Synology etc.) with pre-made packages, make sure these are set up to use our source repository (CouchPotato/CouchPotatoServer) and nothing else!
+ * Do not "bump" issues with "Any updates on this" or whatever. Yes I've seen it, you don't have to remind me of it. There will be an update when the code is done or I need information. If you feel the need to do so, you'd better have more info on the issue.
+
+The more relevant information you provide, the more likely that your issue will be resolved.
+If you don't follow any of the checks above, I'll close the issue. If you are wondering why (and ask) I'll block you from posting new issues and the repo.
+
+## Pull Requests
+Pull requests are intended for contributing code or documentation to the project. Before you submit a pull request, consider the following:
+ * Make sure your pull request is made for the *develop* branch (or relevant feature branch).
+ * Have you tested your PR? If not, why?
+ * Does your PR have any limitations I should know of?
+ * Is your PR up-to-date with the branch you're trying to push into?

.github/issue_template.md

@@ -0,0 +1,14 @@
+### Steps to reproduce:
+1. ..
+2. ..
+
+### Information:
+Movie(s) I have this with: ...
+Quality of the movie being searched: ...
+Providers I use: ...
+Version of CouchPotato: ...
+Running on: ...
+
+### Logs:
+```
+```

.github/pull_request_template.md

@@ -0,0 +1,5 @@
+### Description of what this fixes:
+...
+
+### Related issues:
+...

.gitignore

@@ -1,5 +1,19 @@
 *.pyc
 /data/
+/_env/
 /_source/
 .project
 .pydevproject
+/node_modules/
+/.tmp/
+/.sass-cache/
+.coverage
+coverage.xml
+nosetests.xml
+
+# Visual Studio
+
+/.vs
+
+.DS_Store
+/.vscode/

.nosetestsrc

@@ -0,0 +1,2 @@
+[nosetests]
+where=couchpotato

.travis.yml

@@ -0,0 +1,35 @@
+language: python
+
+# with enabled SUDO the build goes slower
+sudo: false
+
+python:
+  # - "2.6"
+  - "2.7"
+  # - "3.2"
+  # - "3.3"
+  # - "3.4"
+  # - "3.5"
+  # - "3.5-dev" # 3.5 development branch
+  # - "nightly" # currently points to 3.6-dev
+
+cache:
+  pip: true
+  directories:
+  - node_modules
+  - libs
+  - lib
+
+# command to install dependencies
+install:
+  - pip install --upgrade pip
+  - npm install
+  - pip install -r requirements-dev.txt -t ./libs
+
+# command to run tests
+script:
+  - grunt test
+  - grunt coverage
+
+after_success:
+  coveralls

CouchPotato.py

@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+from __future__ import print_function
 from logging import handlers
 from os.path import dirname
 import logging
@@ -9,7 +10,6 @@
 import subprocess
 import sys
 import traceback
-import time
 
 # Root path
 base_path = dirname(os.path.abspath(__file__))
@@ -18,7 +18,12 @@
 sys.path.insert(0, os.path.join(base_path, 'libs'))
 
 from couchpotato.environment import Env
-from couchpotato.core.helpers.variable import getDataDir
+from couchpotato.core.helpers.variable import getDataDir, removePyc
+
+
+# Remove pyc files before dynamic load (sees .pyc files regular .py modules)
+removePyc(base_path)
+
 
 class Loader(object):
 
@@ -28,7 +33,7 @@ def __init__(self):
 
         # Get options via arg
         from couchpotato.runner import getOptions
-        self.options = getOptions(base_path, sys.argv[1:])
+        self.options = getOptions(sys.argv[1:])
 
         # Load settings
         settings = Env.get('settings')
@@ -47,9 +52,9 @@ def __init__(self):
             os.makedirs(self.data_dir)
 
         # Create logging dir
-        self.log_dir = os.path.join(self.data_dir, 'logs');
+        self.log_dir = os.path.join(self.data_dir, 'logs')
         if not os.path.isdir(self.log_dir):
-            os.mkdir(self.log_dir)
+            os.makedirs(self.log_dir)
 
         # Logging
         from couchpotato.core.logger import CPLog
@@ -66,14 +71,15 @@ def addSignals(self):
         signal.signal(signal.SIGTERM, lambda signum, stack_frame: sys.exit(1))
 
         from couchpotato.core.event import addEvent
-        addEvent('app.after_shutdown', self.afterShutdown)
+        addEvent('app.do_shutdown', self.setRestart)
 
-    def afterShutdown(self, restart):
+    def setRestart(self, restart):
         self.do_restart = restart
+        return True
 
     def onExit(self, signal, frame):
         from couchpotato.core.event import fireEvent
-        fireEvent('app.shutdown', single = True)
+        fireEvent('app.shutdown', single=True)
 
     def run(self):
 
@@ -90,14 +96,15 @@ def restart(self):
             # remove old pidfile first
             try:
                 if self.runAsDaemon():
-                    try: self.daemon.stop()
-                    except: pass
+                    try:
+                        self.daemon.stop()
+                    except:
+                        pass
             except:
                 self.log.critical(traceback.format_exc())
 
             # Release log files and shutdown logger
             logging.shutdown()
-            time.sleep(3)
 
             args = [sys.executable] + [os.path.join(base_path, os.path.basename(__file__))] + sys.argv[1:]
             subprocess.Popen(args)
@@ -117,7 +124,7 @@ def daemonize(self):
                 self.log.critical(traceback.format_exc())
 
     def runAsDaemon(self):
-        return self.options.daemon and  self.options.pid_file
+        return self.options.daemon and self.options.pid_file
 
 
 if __name__ == '__main__':
@@ -132,14 +139,15 @@ def runAsDaemon(self):
         pass
     except SystemExit:
         raise
-    except socket.error as (nr, msg):
+    except socket.error as e:
         # log when socket receives SIGINT, but continue.
         # previous code would have skipped over other types of IO errors too.
+        nr, msg = e
         if nr != 4:
             try:
                 l.log.critical(traceback.format_exc())
             except:
-                print traceback.format_exc()
+                print(traceback.format_exc())
             raise
     except:
         try:
@@ -148,7 +156,7 @@ def runAsDaemon(self):
             if l:
                 l.log.critical(traceback.format_exc())
             else:
-                print traceback.format_exc()
+                print(traceback.format_exc())
         except:
-            print traceback.format_exc()
+            print(traceback.format_exc())
         raise