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

now used mv. tested and works for me. #32

Merged
merged 1 commit into from Jan 5, 2012

Conversation

Projects
None yet
4 participants
@Mar2zz
Contributor

Mar2zz commented Jan 2, 2012

3rd time lol. need to get grips with git, sorry. I deleted my repo for it haha

also added a warning to create a settings.py if it is not found (see database.py)

now used mv. tested and works for me.
also added a warning to create a settings.py if it is not found.
@mrkipling

This comment has been minimized.

Owner

mrkipling commented Jan 2, 2012

Looks good - will have a proper look as soon as I can, hopefully over the next couple of days, and see about getting this merged in.

@Mar2zz

This comment has been minimized.

Contributor

Mar2zz commented Jan 2, 2012

Ok. Think it will give some trouble merging it in other branches because of the renaming of Maraschino.py.

My other pullrequest, about the commandline stuff, will finish it when you have decided about this one (or it will conflict again).

Also, on xbmc.org people requested about the database being created by default in the maraschino's root. That's an idea?

Also, port 5000 is conflicting with Couchpotato and with Synology DSM. Could you consider changing the default ports in settings_example.py?

@gugahoi

This comment has been minimized.

Collaborator

gugahoi commented Jan 3, 2012

I also believe creating at root by default is best. Dont know if you guys realise this but we can use relative paths in the DATABASE variable. So by default I think we should have './maraschino.db' and eliminate the need to creating a settings.py. The settings should be overwritten with command line args if desired (--dbpath --port --cherrypyport --user --pw are just some ideas)

@N3MIS15

This comment has been minimized.

Collaborator

N3MIS15 commented Jan 3, 2012

Tested on unraid vm without dependencies installed and worked flawlessly

@mrkipling

This comment has been minimized.

Owner

mrkipling commented Jan 5, 2012

Mar2zz: that's just the development port (for us developers, and people testing it out quickly before committing to a proper install. The CherryPy method uses 7000 by default (although you can change this) and if you configure Apache then you can put it on whatever port you want.

@mrkipling mrkipling merged commit 65646a9 into mrkipling:master Jan 5, 2012

@mrkipling

This comment has been minimized.

Owner

mrkipling commented Jan 5, 2012

Okay, so I've just reviewing this pull request and it all appears to work fine. Good job!

I think that including all of these dependencies is the way to go, so I've pushed this straight to master. Let's see how people find it, and if they have any problems we should make fixing these high priority. Worst case scenario where we've borked everything, we can just revert the single commit where I merged it in and do so some more work on it.

I'll post on of the forums explaining the benefits, and that people need to update their WSGI files (or however they're serving Maraschino) to point to Maraschino.py instead of maraschino.py.

Will also update the official website with new installation instructions.

Thanks for the awesome contribution, Mar2zz!

@mrkipling

This comment has been minimized.

Owner

mrkipling commented Jan 5, 2012

Would just like to add that I haven't tested it super-thoroughly, but the only thing I needed to do was pull, make the simple change in my WSGI file from maraschino to Maraschino, restart Apache, and bam - everything working perfectly. I also uninstalled the dependencies from my server beforehand.

As mentioned above, let's listen to our users and see what issues they find (if any). I'm pretty sure that it will be mostly fine though.

@Mar2zz

This comment has been minimized.

Contributor

Mar2zz commented Jan 5, 2012

Op 05-01-12 21:21, Bradley Abrahams schreef:

Would just like to add that I haven't tested it super-thoroughly, but the only thing I needed to do was pull, make the simple change in my WSGI file from maraschino to Maraschino, restart Apache, and bam - everything working perfectly. I also uninstalled the dependencies from my server beforehand.

As mentioned above, let's listen to our users and see what issues they find (if any). I'm pretty sure that it will be mostly fine though.


Reply to this email directly or view it on GitHub:
#32 (comment)
Great. This lowers install-anxiety a lot for newcomers!

About the cherrypy, will show tomorrow a new commandline pull request,
which enables cherrypy inside Maraschino.py. This makes choosing a
servertype easy. Start with Maraschino.py --quiet or something and start
cherrypy-server, or start with --develop and start flask-server. Dunno
which best. For users not coding, the best behaviour is perhaps to
always start the cherrypy by default, and for dev's with the --develop
parameter to start flask? An idea to go by? What's your opinion on this?
Using opt-parse it's very easy to write, opt-parse is a default
python-package so it doesn't need to be in lib. CouchPotato uses it too
(see CouchPotato.py for examples). Sickbeard uses own written argparser
version with a for loop, can be used too (see SickBeard.py for examples).

@mrkipling

This comment has been minimized.

Owner

mrkipling commented Jan 5, 2012

@Mar2zz: I look forward to trying out your command line pull request, sounds intriguing. I haven't seen any mention of Apache in your comment, so my only 2 cents would be to make sure that it doesn't break Apache (I can test this if you like as I prefer Apache over CherryPy).

@Mar2zz

This comment has been minimized.

Contributor

Mar2zz commented Jan 5, 2012

I can test apache too. I have two apache-servers running, so no problem.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment