Merging last develop version from sarakha to my develop #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

Kiiv wants to merge 2,751 commits into Kiiv:develop from an0Nym0us63:develop

.editorconfig

-Original file line number
+Diff line change
@@ -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

.gitignore

-Original file line number
+Diff line change
@@ -1,5 +1,8 @@
     *.pyc
     /data/
+    /_env/
     /_source/
     .project
     .pydevproject
+    node_modules
+    .tmp

CouchPotato.py

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -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')

    @@ -49,7 +54,7 @@ def __init__(self):
  
            # Create logging dir

            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,10 +71,11 @@ 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

    @@ -97,7 +103,6 @@ def restart(self):
  
                # 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)

    @@ -132,14 +137,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 +154,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

Gruntfile.js

-Original file line number
+Diff line change
@@ -0,0 +1,199 @@
+    'use strict';
+    module.exports = function(grunt){
+    	require('jit-grunt')(grunt);
+    	require('time-grunt')(grunt);
+    	grunt.loadNpmTasks('grunt-shell-spawn');
+    	// Configurable paths
+    	var config = {
+    		python: grunt.file.exists('./_env/bin/python') ? './_env/bin/python' : 'python',
+    		tmp: '.tmp',
+    		base: 'couchpotato',
+    		css_dest: 'couchpotato/static/style/combined.min.css',
+    		scripts_vendor_dest: 'couchpotato/static/scripts/combined.vendor.min.js',
+    		scripts_base_dest: 'couchpotato/static/scripts/combined.base.min.js',
+    		scripts_plugins_dest: 'couchpotato/static/scripts/combined.plugins.min.js'
+    	};
+    	var vendor_scripts_files = [
+    		'couchpotato/static/scripts/vendor/mootools.js',
+    		'couchpotato/static/scripts/vendor/mootools_more.js',
+    		'couchpotato/static/scripts/vendor/Array.stableSort.js',
+    		'couchpotato/static/scripts/vendor/history.js',
+    		'couchpotato/static/scripts/vendor/dynamics.js',
+    		'couchpotato/static/scripts/vendor/fastclick.js',
+    		'couchpotato/static/scripts/vendor/requestAnimationFrame.js'
+    	];
+    	var scripts_files = [
+    		'couchpotato/static/scripts/library/uniform.js',
+    		'couchpotato/static/scripts/library/question.js',
+    		'couchpotato/static/scripts/library/scrollspy.js',
+    		'couchpotato/static/scripts/couchpotato.js',
+    		'couchpotato/static/scripts/api.js',
+    		'couchpotato/static/scripts/page.js',
+    		'couchpotato/static/scripts/block.js',
+    		'couchpotato/static/scripts/block/navigation.js',
+    		'couchpotato/static/scripts/block/header.js',
+    		'couchpotato/static/scripts/block/footer.js',
+    		'couchpotato/static/scripts/block/menu.js',
+    		'couchpotato/static/scripts/page/home.js',
+    		'couchpotato/static/scripts/page/settings.js',
+    		'couchpotato/static/scripts/page/about.js',
+    		'couchpotato/static/scripts/page/login.js'
+    	];
+    	grunt.initConfig({
+    		// Project settings
+    		config: config,
+    		// Make sure code styles are up to par and there are no obvious mistakes
+    		jshint: {
+    			options: {
+    				reporter: require('jshint-stylish'),
+    				unused: false,
+    				camelcase: false,
+    				devel: true
+    			},
+    			all: [
+    				'<%= config.base %>/{,**/}*.js',
+    				'!<%= config.base %>/static/scripts/vendor/{,**/}*.js',
+    				'!<%= config.base %>/static/scripts/combined.*.js'
+    			]
+    		},
+    		// Compiles Sass to CSS and generates necessary files if requested
+    		sass: {
+    			options: {
+    				compass: true,
+    				update: true,
+    				sourcemap: 'none'
+    			},
+    			server: {
+    				files: [{
+    					expand: true,
+    					cwd: '<%= config.base %>/',
+    					src: ['**/*.scss'],
+    					dest: '<%= config.tmp %>/styles/',
+    					ext: '.css'
+    				}]
+    			}
+    		},
+    		// Empties folders to start fresh
+    		clean: {
+    			server: '.tmp'
+    		},
+    		// Add vendor prefixed styles
+    		autoprefixer: {
+    			options: {
+    				browsers: ['last 2 versions'],
+    				remove: false,
+    				cascade: false
+    			},
+    			dist: {
+    				files: [{
+    					expand: true,
+    					cwd: '<%= config.tmp %>/styles/',
+    					src: '{,**/}*.css',
+    					dest: '<%= config.tmp %>/styles/'
+    				}]
+    			}
+    		},
+    		cssmin: {
+    			dist: {
+    				options: {
+    					keepBreaks: true
+    				},
+    				files: {
+    					'<%= config.css_dest %>': ['<%= config.tmp %>/styles/**/*.css']
+    				}
+    			}
+    		},
+    		uglify: {
+    			options: {
+    				mangle: false,
+    				compress: false,
+    				beautify: true,
+    				screwIE8: true
+    			},
+    			vendor: {
+    				files: {
+    					'<%= config.scripts_vendor_dest %>': vendor_scripts_files
+    				}
+    			},
+    			base: {
+    				files: {
+    					'<%= config.scripts_base_dest %>': scripts_files
+    				}
+    			},
+    			plugins: {
+    				files: {
+    					'<%= config.scripts_plugins_dest %>': ['<%= config.base %>/core/**/*.js']
+    				}
+    			}
+    		},
+    		shell: {
+    			runCouchPotato: {
+    				command: '<%= config.python %> CouchPotato.py',
+    				options: {
+    					stdout: true,
+    					stderr: true
+    				}
+    			}
+    		},
+    		// COOL TASKS ==============================================================
+    		watch: {
+    			scss: {
+    				files: ['<%= config.base %>/**/*.{scss,sass}'],
+    				tasks: ['sass:server', 'autoprefixer', 'cssmin']
+    			},
+    			js: {
+    				files: [
+    					'<%= config.base %>/**/*.js',
+    					'!<%= config.base %>/static/scripts/combined.*.js'
+    				],
+    				tasks: ['uglify:base', 'uglify:plugins', 'jshint']
+    			},
+    			livereload: {
+    				options: {
+    					livereload: 35729
+    				},
+    				files: [
+    					'<%= config.css_dest %>',
+    					'<%= config.scripts_vendor_dest %>',
+    					'<%= config.scripts_base_dest %>',
+    					'<%= config.scripts_plugins_dest %>'
+    				]
+    			}
+    		},
+    		concurrent: {
+    			options: {
+    				logConcurrentOutput: true
+    			},
+    			tasks: ['shell:runCouchPotato', 'watch']
+    		}
+    	});
+    	grunt.registerTask('default', [
+    		'clean:server',
+    		'sass:server',
+    		'autoprefixer',
+    		'cssmin',
+    		'uglify:vendor',
+    		'uglify:base',
+    		'uglify:plugins',
+    		'concurrent'
+    	]);
+    };

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merging last develop version from sarakha to my develop #15

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

Merging last develop version from sarakha to my develop #15

Are you sure you want to change the base?

Uh oh!

Merging last develop version from sarakha to my develop #15

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!