Version 1.5.0

bin/dottorrent_cli

@@ -58,7 +58,9 @@ if __name__ == '__main__':
     parser.add_argument(
         'path', help='path to file/directory to create torrent from')
     parser.add_argument(
-        'output_file', help='Output filename for created .torrent file')
+        'output_path', help='Output path for created .torrent file. \
+        If a directory is provided, the filename will be automatically \
+        generated based on the input.')
     args = parser.parse_args()
 
     if args.date:
@@ -112,16 +114,15 @@ if __name__ == '__main__':
 
     t.generate(callback=progress_callback)
     pbar.close()
-
-    if os.path.isdir(args.output_path):
-        last_part = os.path.basename(args.path)
-        no_ext = os.path.splitext(last_part)[0]
-
-        save_name = os.path.join(args.output_path, '{}.torrent'.format(no_ext))
+
+    output_path = os.path.normpath(args.output_path)
+    if os.path.isdir(output_path):
+        path_base = os.path.splitext(os.path.basename(t.path))[0]
+        save_fn = os.path.join(args.output_path, path_base + '.torrent')
     else:
-        save_name = args.output_path
+        save_fn = args.output_path
 
-    with open(save_name, 'wb') as f:
+    with open(save_fn, 'wb') as f:
         t.save(f)
     print("Info hash: " + t.info_hash)
-    print("Torrent file saved to {}".format(args.output_file))
+    print("Torrent file saved to {}".format(save_fn))

docs/changelog.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.5.0
+-----
+* Allow both file and directory names to be specified for output_path (PR #1, @mahkitah)
+
 1.4.3
 -----
 * dottorrent_cli: Change output_path to output_file for clarity

docs/cli.rst

@@ -11,13 +11,15 @@ available in your system path.
 	usage: dottorrent_cli [-h] [--tracker TRACKER] [--web_seed WEB_SEED]
 	                      [--piece_size PIECE_SIZE] [--private]
 	                      [--comment COMMENT] [--date DATE] [--md5] [--verbose]
-	                      path output_file
+	                      path output_path
 
 	Create a .torrent file
 
 	positional arguments:
 	  path                  path to file/directory to create torrent from
-	  output_file           Output filename for created .torrent file
+	  output_path           Output path for created .torrent file. If a directory
+	                        is provided, the filename will be automatically
+	                        generated based on the input.
 
 	optional arguments:
 	  -h, --help            show this help message and exit
@@ -35,7 +37,8 @@ available in your system path.
 	  --md5                 Add per-file MD5 hashes
 	  --verbose, -v         verbose mode
 
-	dottorrent/1.4.3 (https://github.com/kz26/dottorrent)
+	dottorrent/1.5.0 (https://github.com/kz26/dottorrent)
+
 
 
 To add multiple trackers and/or web seeds, repeat the ``-t`` and ``-w`` as many times as necessary,

dottorrent/version.py

@@ -1 +1 @@
-__version__ = '1.4.3'
+__version__ = '1.5.0'