Merge pull request #99 from alexpdev/Fixes_#96

Fixes a couple of bugs mentioned is issues #96 and #98

Author: alexpdev

docs/objects.inv

@@ -2,37 +2,37 @@
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
     <url>
          <loc>https://alexpdev.github.io/torrentfile/</loc>
-         <lastmod>2022-03-08</lastmod>
+         <lastmod>2022-03-17</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://alexpdev.github.io/torrentfile/API/</loc>
-         <lastmod>2022-03-08</lastmod>
+         <lastmod>2022-03-17</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://alexpdev.github.io/torrentfile/Commands/</loc>
-         <lastmod>2022-03-08</lastmod>
+         <lastmod>2022-03-17</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://alexpdev.github.io/torrentfile/LGPLv3/</loc>
-         <lastmod>2022-03-08</lastmod>
+         <lastmod>2022-03-17</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://alexpdev.github.io/torrentfile/changelog/</loc>
-         <lastmod>2022-03-08</lastmod>
+         <lastmod>2022-03-17</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://alexpdev.github.io/torrentfile/examples/</loc>
-         <lastmod>2022-03-08</lastmod>
+         <lastmod>2022-03-17</lastmod>
          <changefreq>daily</changefreq>
     </url>
     <url>
          <loc>https://alexpdev.github.io/torrentfile/source/</loc>
-         <lastmod>2022-03-08</lastmod>
+         <lastmod>2022-03-17</lastmod>
          <changefreq>daily</changefreq>
     </url>
 </urlset>

docs/search/search_index.json

@@ -1,7 +1,7 @@
 {
   "name": "torrentfile",
   "displayName": "TorrentFile",
-  "version": "0.6.12",
+  "version": "0.6.13",
   "description": "Create Bittorent v1, v2 and hybrid meta files.",
   "repository": {
     "type": "git",

docs/sitemap.xml

@@ -407,3 +407,34 @@ def test_cli_subprocess(dir2):
         rmpath(out)
     else:  # pragma: nocover
         assert os.environ.get("GITHUB_WORKFLOW")
+
+
+@pytest.mark.parametrize("ending", ["/", "\\"])
+def test_cli_slash_path(dir2, ending):
+    """
+    Test if output when path ends with a /.
+    """
+    if sys.platform != "win32" and ending == "\\":  # pragma: nocover
+        ending = "/"
+    args = [
+        "torrentfile",
+        "create",
+        "-t",
+        "https://announce1.org",
+        "--private",
+        str(dir2) + ending,
+    ]
+    sys.argv = args
+    main()
+    assert os.path.exists(str(dir2) + ".torrent")
+
+
+@pytest.mark.parametrize("flag", ["-t", "-w", "-a"])
+def test_cli_announce_path(dir2, flag):
+    """
+    Test CLI when path is placed after the trackers flag.
+    """
+    args = ["torrentfile", "create", flag, "https://announce1.org", str(dir2)]
+    sys.argv = args
+    main()
+    assert os.path.exists(str(dir2) + ".torrent")

docs/sitemap.xml.gz

@@ -321,6 +321,7 @@ def execute(args=None):
         "content",
         action="store",
         metavar="<content>",
+        nargs="?",
         help="Path to content file or directory",
     )
 

docs/source/index.html

@@ -242,7 +242,16 @@ def __init__(self, path=None, announce=None, private=False,
         Construct MetaFile superclass and assign local attributes.
         """
         if not path:
-            raise utils.MissingPathError
+            found = False
+            if announce or url_list:
+                if announce and os.path.exists(announce[-1]):
+                    path = announce.pop()
+                    found = True
+                elif url_list and os.path.exists(url_list[-1]):
+                    path = url_list.pop()
+                    found = True
+            if not found:
+                raise utils.MissingPathError
 
         # base path to torrent content.
         self.path = path
@@ -276,6 +285,7 @@ def __init__(self, path=None, announce=None, private=False,
         self.comment = comment
         self.url_list = url_list
         self.source = source
+
         self.meta = {
             "announce": self.announce,
             "announce-list": self.announce_list,
@@ -292,8 +302,13 @@ def __init__(self, path=None, announce=None, private=False,
             self.meta["info"]["source"] = source
         if url_list:
             self.meta["url-list"] = url_list
-        self.meta["info"]["name"] = os.path.basename(self.path)
         self.meta["info"]["piece length"] = self.piece_length
+
+        parent, name = os.path.split(self.path)
+        if not name:
+            name = os.path.basename(parent)
+        self.meta["info"]["name"] = name
+
     # fmt: on
 
     def assemble(self):
@@ -334,7 +349,8 @@ def write(self, outfile=None) -> tuple:
             self.outfile = outfile
 
         if self.outfile is None:
-            self.outfile = str(self.path) + ".torrent"
+            path = str(self.path).rstrip("\\/")
+            self.outfile = path + ".torrent"
 
         self.meta = self.sort_meta()
         pyben.dump(self.meta, self.outfile)

package.json

@@ -15,4 +15,4 @@
 Holds the release version number.
 """
 
-__version__ = "0.6.12"
+__version__ = "0.6.13"