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

[Fix] Videoscanner should not skip sftp/ssh sources #2058

Merged

Conversation

norbini
Copy link
Contributor

@norbini norbini commented Jan 9, 2013

Override CSFTPDirectory::Exists() method to correctly report whether an SFTP url represents a directory or not.

Fixes ticket #13784.

Refactored CSFTPSession::Exists() into FileExists() and DirectoryExists() methods, and have CSFTPFile and CSFTPDirectory classes use them.
This means that Exists() calls on these classes correctly only return true if the url refers to an item of the appropriate type (e.g. a file or a directory).

This has been tested under Linux (Ubuntu 12.04) and Windows Vista (32-bit).

@Memphiz
Copy link
Member

Memphiz commented Jan 18, 2013

Looks good to me. You also added win32 defines there - did you test compile it on windows or any other platforms beside linux?

@norbini
Copy link
Contributor Author

norbini commented Jan 18, 2013

I've compiled this on Windows Vista (32-bit) and Linux. I've updated the original comment to reflect this.

@Memphiz
Copy link
Member

Memphiz commented Jan 18, 2013

signed-off for osx and ios (buildtested + runtimetest on osx at least didn't break sshfs access ;) ).

@ghost ghost assigned Memphiz Jan 18, 2013
@wsnipex
Copy link
Member

wsnipex commented Jan 22, 2013

works for me on ubuntu

@jmarshallnz
Copy link
Contributor

Squash it down to a single commit (git rebase -i HEAD~3) and I'll pull it.

Let me know via commenting when done (else I won't get notified)

…an SFTP url represents a directory or not.

Fixes ticket xbmc#13784.

Refactored CSFTPSession::Exists() into FileExists() and DirectoryExists() methods, and have CSFTPFile and CSFTPDirectory classes use them.
This means that Exists() calls on these classes correctly only return true if the url refers to an item of the appropriate type (e.g. a file or a directory).
@norbini
Copy link
Contributor Author

norbini commented Jan 25, 2013

Hopefully that's done the trick. I'm afraid this is my first serious outing with git, so this is a bit of a trial-by-fire! :-)
Please let me know if there's anything else I should do with it.

Many thanks,
-Norbini

@jmarshallnz
Copy link
Contributor

Looks good - thanks!

jmarshallnz added a commit that referenced this pull request Jan 25, 2013
…_sftp

[Fix] Videoscanner should not skip sftp/ssh sources
@jmarshallnz jmarshallnz merged commit c950be7 into xbmc:master Jan 25, 2013
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.

4 participants