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

Couchpotato Module #169

Merged
merged 42 commits into from
Jul 16, 2012
Merged

Couchpotato Module #169

merged 42 commits into from
Jul 16, 2012

Conversation

gugahoi
Copy link
Collaborator

@gugahoi gugahoi commented Jul 2, 2012

Finally I am happy with this. There is room to improve and features to add but the core of it is there. Not so sure of the settings cog I added, @N3MIS15 's implementation might be better where log, restart and shutdown only appear in settings mode.

gugahoi and others added 30 commits January 11, 2012 14:17
Conflicts:
	.gitignore
	AUTHORS
	Maraschino.py
	maraschino/modules.py
	maraschino/tools.py
	modules/applications.py
	modules/controls.py
	modules/currently_playing.py
	modules/library.py
	modules/recently_added.py
	modules/recommendations.py
	modules/sabnzbd.py
	modules/sickbeard.py
	modules/transmission.py
	static/js/index.js
	static/less/module-currently_playing.less
	static/less/module-library.less
	static/less/module-recently_added.less
	static/less/module-sabnzbd.less
	static/less/module-sickbeard.less
	static/less/module-transmission.less
	static/less/settings.less
	static/less/site.less
	templates/base.html
	templates/currently_playing.html
	templates/library.html
	templates/recently_added.html
	templates/recently_added_albums.html
	templates/recently_added_movies.html
	templates/sabnzbd-base.html
	templates/sabnzbd-queue.html
	templates/server_settings_dialog.html
A lot of API calls exposed
No more annoying expansion of results
@gugahoi
Copy link
Collaborator Author

gugahoi commented Jul 2, 2012

Just realised I didnt proxy the images. Will have to do that before the merge.

@N3MIS15
Copy link
Collaborator

N3MIS15 commented Jul 2, 2012

It looks to me like the images are pulled from the web, at least mine are. So it wouldnt be a game changer if they weren't proxied.

@mvanderberg
Copy link
Contributor

@gugahoi
Looks nice... I do have two minor remarks:

  1. when in compact mode, after the selection of an entry the module disappears from the screen and I see this on the commandline:
11:25:36 :: INFO :: CouchPotato :: Fetching "wanted movies" list
11:25:37 :: INFO :: CouchPotato :: Fetching "wanted movies" list (DONE)
11:25:41 :: INFO :: CouchPotato :: Retrieving movie info
11:25:41 :: INFO :: CouchPotato :: Getting quality profiles
11:25:42 :: INFO :: CouchPotato :: Retrieving movie info (DONE)
11:25:42 :: DEBUG :: CouchPotato :: EXCEPTION -- 'dict object' has no attribute
'rating'
  1. when in full mode, before selecting an entry, the text is displayed correctly, but it looks like this:
    screen

Thanks!
best regards, Mark

@gugahoi
Copy link
Collaborator Author

gugahoi commented Jul 7, 2012

Thanks for testing, I do need the feedback! I believe i have been using local paths for some of the images so will have to change that. Any chance you can check what path it is using? Should be in your inspector or something (right click -> inspect element on chrome).

I'll look into the compact mode error, although it seems weird for it to happen only in compact mode. Can you try clicking the same movie in regular mode and see if it works?

Cheers.

@mvanderberg
Copy link
Contributor

No problem... Happy to help.
The module works really well..

The compact mode error is gone (?) for some reason....

The missing image issue:
The following path:
(If I parse the following link in a browser, I get 'Wrong API key used'...)

http:https://None:[email protected]:5050/couchpotato/api/bf370c369bf94ef5ab948b2f5706e1d6/file.cacheD:/Apps/CouchPotatoServer/cache/1fd0867186df289eb95eebec9a0da03e.jpg

Thanks in advance,
best regards, Mark

UPDATE:
I think the problem is the missing '/' after 'file.cache' in the image link....

the following line url works (with the '/')
http:https://192.168.0.100:5050/couchpotato/api/bf370c369bf94ef5ab948b2f5706e1d6/file.cache/D:/Apps/CouchPotatoServer/cache/1fd0867186df289eb95eebec9a0da03e.jpg

@mrkipling
Copy link
Owner

@gugahoi: if you're happy with this, merge it in. I've been so super-lame recently with the updates, I've had so little time. If we need to change things then we can always do so at a later date.

Basically, I trust your judgement with this one, so if you're happy that the CouchPotato module is good-to-go, let's get it on master!

@mvanderberg
Copy link
Contributor

@gugahoi : I changed the path in templates\couchpotato_all.html and templates\couchpotato.html...
I tried to create a pull request for you, but I'm not sure if that worked...

Can you check?

Thanks in advance,
best regards, Mark

@mvanderberg
Copy link
Contributor

@gugahoi @N3MIS15 :
Hi,

When I Maraschino with the changes mentioned in the post before, and compare them with the branch from N3MIS15, there is a rather big performance difference....
gugahoi's branche loads faster....

Any idea?

Thanks in advance,
best regards, Mark

@gugahoi
Copy link
Collaborator Author

gugahoi commented Jul 14, 2012

@mvanderberg Ye the pull request worked fine. I've just been a bit busy the last few days. I havent had the chance to test @N3MIS15 stuff either but I think that will be the way to go. If there is a significant performance drop (which I find unlikely), I will try to find a workaround.

@@ -177,3 +177,6 @@
cursor: pointer;
opacity: 1;
}

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are there changes here?

@N3MIS15 N3MIS15 merged commit 1a9f4e0 into mrkipling:master Jul 16, 2012
@Jeroenve
Copy link
Contributor

Https support is missing while option can be enabled on the settings page.

Fixed it in #180

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants