Skip to content

unquote filename from magnet on % symbol #1

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.

Sign up for GitHub

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

Merged
LordAro merged 5 commits into from
Jun 12, 2017
Merged

unquote filename from magnet on % symbol #1

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ccb5bfd
unquote filename from magnet on % symbol
szero May 13, 2017
d9ff0a0
get filename from torrent handle if magnet doesn't have dn field
szero May 13, 2017
bca1102
chg: dev: update with patch from @Szero
rachmadaniHaryono Jun 10, 2017
35d8b5a
chg: dev: log when index error.
rachmadaniHaryono Jun 10, 2017
27618e2
Merge pull request #1 from rachmadaniHaryono/feature/add-szero-fix
szero Jun 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions Magnet2Torrent.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env python
#!/usr/bin/env python3
"""convert magnet link to torrent file.

Created on Apr 19, 2012 @author: dan, Faless
Expand All @@ -21,16 +21,17 @@

"""

import logging
import os.path as pt
import shutil
import sys
import tempfile
from argparse import ArgumentParser
from time import sleep
try:
from urllib.parse import unquote
from urllib.parse import unquote_plus
except ImportError:
from urllib import unquote
from urllib import unquote_plus
import libtorrent as lt


Expand Down Expand Up @@ -90,7 +91,7 @@ def run(self):
soft_limit += 30
wait_time += 1
except KeyboardInterrupt:
print("Aborting...")
print("\nAborting...")
self.ses.pause()
print("Cleanup dir " + self.tempdir)
shutil.rmtree(self.tempdir)
Expand All @@ -109,6 +110,8 @@ def run(self):
torinfo.name() + ".torrent"))
elif pt.isdir(pt.dirname(pt.abspath(self.output_name))):
output = pt.abspath(self.output_name)
else:
output = pt.abspath(torinfo.name() + ".torrent")

Copy link
Author

@szero szero May 13, 2017

Choose a reason for hiding this comment

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

If self.output_name is None, set the torrent name from the torrent handle.

print("Saving torrent file here : " + output + " ...")
with open(output, "wb") as outfile:
Expand Down Expand Up @@ -164,22 +167,24 @@ def main():

# guess the name if output name is not given.
# in a magnet link it is between '&dn' and '&tr'
if output_name is None:
output_name = magnet.split('&dn=')[1].split('&tr')[0]
if '+' in output_name:
output_name = unquote(output_name)
output_name += '.torrent'
try:
if output_name is None:
output_name = magnet.split('&dn=')[1].split('&tr')[0]
output_name = unquote_plus(output_name)
output_name += '.torrent'
except IndexError:
logging.error('magnet: {}'.format(magnet))

# return if user wants to skip existing file.
if pt.isfile(output_name) and args.skip_file:
if output_name is not None and pt.isfile(output_name) and args.skip_file:
print('File [{}] already exists.'.format(output_name))
# still open file if file already exists.
if args.open_file:
open_default_app(output_name)
return

# create fullname if file exists.
if pt.isfile(output_name) and not args.rewrite_file:
if output_name is not None and pt.isfile(output_name) and not args.rewrite_file:
new_output_name = output_name
counter = 1
while pt.isfile(new_output_name):
Expand All @@ -192,8 +197,8 @@ def main():
output_name = new_output_name

# encode magnet link if it's url decoded.
if magnet != unquote(magnet):
magnet = unquote(magnet)
if magnet != unquote_plus(magnet):
magnet = unquote_plus(magnet)

conv = Magnet2Torrent(magnet, output_name)
conv.run()
Expand Down