Major Fix: Downloading Files With Reserved Characters In Thier Names On Windows #178
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Major fix, torrent-stream is now able to download files with reserved characters in their names (e.g. ':'), Manget to test magnet:?xt=urn:btih:LOSJHGQAVGZBMKNAVV6TO2EYW5UNTF5D&dn=Scikit-learn_%20Machine%20Learning%20in%20Python.pdf&tr=http%3A%2F%2Facademictorrents.com%2Fannounce.php&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&xl=42310
jodevak
changed the title
Code re-organized with npm javascript standard
asapach
requested changes
Jan 9, 2017
| @@ -97,6 +96,7 @@ var torrentStream = function (link, opts, cb) { | |||
| engine.infoHash = infoHash | |||
| engine.metadata = metadata | |||
| engine.path = opts.path | |||
| engine.ex = exchangeMetadata | |||
| @@ -125,12 +125,34 @@ var torrentStream = function (link, opts, cb) { | |||
| } | |||
| }) | |||
|
|
|||
| var handleReserved = function (p) { | |||
| this.replaceAt = function (str, index, character) { | |||
There was a problem hiding this comment.
what's this here? is it global?
| var hold = s[i] | ||
| for (var cnt = 0; cnt < hold.length && (s[i] + path.sep) !== root; ++cnt) { | ||
| if (reser.indexOf(hold[cnt]) !== -1) { | ||
| hold = this.replaceAt(hold, cnt, '_') |
There was a problem hiding this comment.
I feel like this would be much simpler if you used regexp and .replace()
There was a problem hiding this comment.
Yes , you are right, i just wanted the project owners to get into the point that its not only parsing the file name, but the full 'given' path of the file. Anyway, ive made a new modification using regexp and .replace(), i hope you have a look to it.
thanks,
asapach
reviewed
Jan 10, 2017
| ++i | ||
| } | ||
| return n.join(path.sep) | ||
| } |
There was a problem hiding this comment.
Does it have to be this complicated? Can't you just do split() -> map() -> replace() -> join()?
asapach
reviewed
Jan 10, 2017
| engine.store = ImmediateChunkStore(storage(torrent.pieceLength, { | ||
| files: torrent.files.map(function (file) { | ||
| return { | ||
| path: path.join(opts.path, file.path), | ||
| path: handleReserved(path.join(opts.path, file.path)), |
There was a problem hiding this comment.
I think you should only handle file.path
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Major fix, torrent-stream is now able to download files with reserved characters in windows file system,
for example assume we have the file's path in the torrent like this dir1/python:introduction.pdf
With this fix the name of the file will be parsed to python_introduction.pdf and the : will be replaced with _ and so on with any other reserved characters.
Manget to test :
magnet:?xt=urn:btih:LOSJHGQAVGZBMKNAVV6TO2EYW5UNTF5D&dn=Scikit-learn_%20Machine%20Learning%20in%20Python.pdf&tr=http%3A%2F%2Facademictorrents.com%2Fannounce.php&tr=udp%3A%2F%2Ftracker.opentrackr.org%3A1337%2Fannounce&tr=udp%3A%2F%2Ftracker.openbittorrent.com%3A80%2Fannounce&xl=42310