Skip to content

Commit

Permalink
now used mv. tested and works for me.
Browse files Browse the repository at this point in the history
also added a warning to create a settings.py if it is not found.
  • Loading branch information
Mar2zz committed Jan 2, 2012
1 parent a608ec7 commit 65646a9
Show file tree
Hide file tree
Showing 478 changed files with 147,570 additions and 65 deletions.
63 changes: 45 additions & 18 deletions maraschino.py → Maraschino.py
@@ -1,26 +1,53 @@
import sys
import os

rundir = os.path.dirname(os.path.abspath(__file__))

try:
frozen = sys.frozen
except AttributeError:
frozen = False

# Define path based on frozen state
if frozen:
path_base = os.environ['_MEIPASS2']
rundir = os.path.dirname(sys.executable)

else:
path_base = rundir

# Include paths
sys.path.insert(0, path_base)
sys.path.insert(0, os.path.join(path_base, 'lib'))

from flask import Flask, jsonify, render_template, request
from database import db_session
from maraschino.database import db_session
import hashlib, json, jsonrpclib, random, urllib, os, sys

from flask import Flask, jsonify, render_template, request
from maraschino.database import db_session
import hashlib, json, jsonrpclib, random, urllib, os, sys

app = Flask(__name__)

from settings import *
from noneditable import *
from tools import *

from applications import *
from controls import *
from currently_playing import *
from diskspace import *
from library import *
from recently_added import *
from recommendations import *
from sabnzbd import *
from sickbeard import *
from trakt import *

from modules import *
from models import Module, Setting

from maraschino.noneditable import *
from maraschino.tools import *

from modules.applications import *
from modules.controls import *
from modules.currently_playing import *
from modules.diskspace import *
from modules.library import *
from modules.recently_added import *
from modules.recommendations import *
from modules.sabnzbd import *
from modules.sickbeard import *
from modules.trakt import *

from maraschino.modules import *
from maraschino.models import Module, Setting

@app.route('/')
@requires_auth
Expand Down Expand Up @@ -88,7 +115,7 @@ def shutdown_session(exception=None):
quit()

# create db
from database import *
from maraschino.database import *

except:
print 'You need to specify a database in settings.py.'
Expand Down
25 changes: 25 additions & 0 deletions lib/cherrypy/LICENSE.txt
@@ -0,0 +1,25 @@
Copyright (c) 2004-2011, CherryPy Team (team@cherrypy.org)
All rights reserved.

Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of the CherryPy Team nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 comments on commit 65646a9

Please sign in to comment.