Skip to content
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

Maraschino core restructure #144

Merged
merged 1 commit into from
Jun 16, 2012
Merged

Maraschino core restructure #144

merged 1 commit into from
Jun 16, 2012

Conversation

N3MIS15
Copy link
Collaborator

@N3MIS15 N3MIS15 commented May 31, 2012

This was a HUGE undertaking.. I didn't know what i was getting myself into.
The main goal of this restructure is to make core stuff more accessable to the rest of the program.
I started by removing the need for maraschino-cherrypy.py using Mar2zz's code as a base. (starts wsgi by default and dev server with --develop)

other args added are: --port, --daemon, --pidfile, --log, --verbose, --database.
Most of the daemon/pidfile stuff is borrowed from headphones.

There is no settings.py required for this branch everything has a default set (database is in maraschino root, port is 7000)
Auth has been disabled for now (i plan on adding it as a setting in the ui).

This branch also fixes forking issues (you may have noticed the database initializing twice..)

A lot has been changed here and i may have broken some things that i have not noticed. I have sent this pull request more to get opinions and some more testing (i have done no testing on osx).

@mrkipling, @gugahoi let me know what you think about this direction

@gugahoi
Copy link
Collaborator

gugahoi commented May 31, 2012

Nice! This had to be done! I have not looked or tested the code but this is something we definitely needed to do.

I've got exams these next couple of weeks but I'll help out when I get back! I'm sure MrK will want to have a say and review this himself so it's a good thing I can't do it now anyway.

@N3MIS15
Copy link
Collaborator Author

N3MIS15 commented May 31, 2012

i know mrkipling is on holidays for a couple weeks anyways, so i didnt expect this to go straight in, but testing is definatly needed. I have no idea if this is the direction mrkipling wants to go, but it does fix some core issues and potentially makes further changes easier.

@N3MIS15
Copy link
Collaborator Author

N3MIS15 commented May 31, 2012

i have tested every module except utorrent now.

@robweber
Copy link
Contributor

i can test utorrent - is there a particular branch I can pull from to test this or do I need to merge all the patches? If you can point me in the right direction I can test this within a few days.

@N3MIS15
Copy link
Collaborator Author

N3MIS15 commented May 31, 2012

https://github.com/N3MIS15/maraschino/tree/init
Thats the branch the pull request is based on. Thanks for helping test.

@robweber
Copy link
Contributor

robweber commented Jun 2, 2012

I checked the utorrent module, it worked for me the same as in previous versions. It should be good to go. Did you see many errors with the other modules? Specifically I'm thinking of the Transmission one since uTorrent is based on that.

@N3MIS15
Copy link
Collaborator Author

N3MIS15 commented Jun 3, 2012

transmission worked for me.. i was sure that utorrent would work, just had no way of testing. thanks for testing it.

I have updated the branch to current master and rebased.

@N3MIS15 N3MIS15 mentioned this pull request Jun 5, 2012
@mrkipling
Copy link
Owner

Haven't had a chance to look at this yet (or any of the other pull requests) but I'm hoping to get a bunch of pull requests done this weekend. Will have a look properly then, but from the description, I'm liking the sound of it!

@mrkipling
Copy link
Owner

N3MIS15: should I review this pull request before the updater? I'd quite like to get the updater in as a matter of priority (if it's ready, that is) but perhaps this PR would be best to deal with first if it's going to cause merge conflicts. What's your opinion?

@N3MIS15
Copy link
Collaborator Author

N3MIS15 commented Jun 12, 2012

Yea, the updater relies on these changes.
The main thing that needs to be looked at here is that all the imports have been covered. I had to shift a lot around to make this work.

@N3MIS15
Copy link
Collaborator Author

N3MIS15 commented Jun 13, 2012

The updater is working using tarball download, I would like it to attempt to run git to update before falling back on the tarball method. This would consist of checking if a .git folder exists. If it does it will try to run git in a subprocess to do the update. I will try to get this done before the weekend.

@N3MIS15
Copy link
Collaborator Author

N3MIS15 commented Jun 13, 2012

umm this throws a spanner in the works. https://github.com/blog/1160-github-api-v2-end-of-life

looks like i need to look into the new api.
Sickbeard/headphones also use v2 of the api so their updaters will be broken too :(

EDIT: Got this sorted, was a pretty simple fix.

@mvanderberg
Copy link
Contributor

Hi,

I tested your init branch, and everything seems to work as expected (maybe even a bit faster...)
The uTorrent module also works normal...

Did you change the sequence in which the modules are loaded?
If my ATV2 is busy, the loading takes a bit longer as the Library modules (recently added episodes and movies) are loading first (before sickbeard). If I select my PC as the xbmc server, everything works fast.

Thanks,
best regards, Mark

@mrkipling mrkipling merged commit 97fb6b2 into mrkipling:master Jun 16, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants