Merge lp:~angeloc/unity-lens-files/fix-for-773841 into lp:unity-lens-files
Proposed by
Michal Hruby
Status: | Merged |
---|---|
Approved by: | Michal Hruby |
Approved revision: | 222 |
Merged at revision: | 217 |
Proposed branch: | lp:~angeloc/unity-lens-files/fix-for-773841 |
Merge into: | lp:unity-lens-files |
Prerequisite: | lp:~mhr3/unity-lens-files/fix-921665 |
Diff against target: |
177 lines (+73/-32) 2 files modified
src/daemon.vala (+31/-13) src/url-checker.vala (+42/-19) |
To merge this branch: | bzr merge lp:~angeloc/unity-lens-files/fix-for-773841 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michal Hruby (community) | Approve | ||
Unity Bugs | Pending | ||
Review via email: mp+96100@code.launchpad.net |
This proposal supersedes a proposal from 2012-03-02.
Description of the change
Fixes activation of remotely mountable volumes.
I am merge proposing this on behalf of Angelo since there appears to be some LP hiccups...
To post a comment you must log in.
Nice work, thanks for the contribution!
A couple of comments:
7 private UrlChecker urls;
8 + private UrlMountChecker murls;
Wouldn't it make sense to extend the UrlChecker class to do this instead of adding yet another class that has almost the same semantics?
130 + regexes.prepend (new Regex ("\\\\.+")); +")); .+"));
131 + regexes.prepend (new Regex ("ftp://.
132 + regexes.prepend (new Regex ("ssh://.+"));
133 + regexes.prepend (new Regex ("sftp://
134 + regexes.prepend (new Regex ("smb://.+"));
135 + regexes.prepend (new Regex ("dav://.+"));
There's no need to use this many regexes - instead you can first preprocess the query by replacing \\ with smb:// (if it has \\ prefix), and then you can use a single regex "(ftp|ssh| sftp|smb| dav):// .+".