v2.3.1 (#54)

* 2.3.1

* 2.3.1

.gitignore

@@ -1,3 +1,6 @@
+# Files generated while testing
+*-urls-*.txt
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

setup.py

@@ -19,7 +19,7 @@ setup(
     author=about["__author__"],
     author_email=about["__author_email__"],
     url=about["__url__"],
-    download_url="https://github.com/akamhy/waybackpy/archive/2.3.0.tar.gz",
+    download_url="https://github.com/akamhy/waybackpy/archive/2.3.1.tar.gz",
     keywords=[
         "Archive It",
         "Archive Website",

waybackpy/__version__.py

@@ -6,7 +6,7 @@ __description__ = (
     "Archive pages and retrieve archived pages easily."
 )
 __url__ = "https://akamhy.github.io/waybackpy/"
-__version__ = "2.3.0"
+__version__ = "2.3.1"
 __author__ = "akamhy"
 __author_email__ = "akash3pro@gmail.com"
 __license__ = "MIT"

waybackpy/cli.py

@@ -91,26 +91,29 @@ def _known_urls(obj, args):
 
 def _get(obj, args):
     if args.get.lower() == "url":
-        return obj.get()
+        output = obj.get()
 
-    if args.get.lower() == "archive_url":
-        return obj.get(obj.archive_url)
+    elif args.get.lower() == "archive_url":
+        output = obj.get(obj.archive_url)
 
-    if args.get.lower() == "oldest":
-        return obj.get(obj.oldest())
+    elif args.get.lower() == "oldest":
+        output = obj.get(obj.oldest())
 
-    if args.get.lower() == "latest" or args.get.lower() == "newest":
-        return obj.get(obj.newest())
+    elif args.get.lower() == "latest" or args.get.lower() == "newest":
+        output = obj.get(obj.newest())
 
-    if args.get.lower() == "save":
-        return obj.get(obj.save())
+    elif args.get.lower() == "save":
+        output = obj.get(obj.save())
 
-    return "Use get as \"--get 'source'\", 'source' can be one of the followings: \
-        \n1) url - get the source code of the url specified using --url/-u.\
-        \n2) archive_url - get the source code of the newest archive for the supplied url, alias of newest.\
-        \n3) oldest - get the source code of the oldest archive for the supplied url.\
-        \n4) newest - get the source code of the newest archive for the supplied url.\
-        \n5) save - Create a new archive and get the source code of this new archive for the supplied url."
+    else:
+        output = "Use get as \"--get 'source'\", 'source' can be one of the followings: \
+            \n1) url - get the source code of the url specified using --url/-u.\
+            \n2) archive_url - get the source code of the newest archive for the supplied url, alias of newest.\
+            \n3) oldest - get the source code of the oldest archive for the supplied url.\
+            \n4) newest - get the source code of the newest archive for the supplied url.\
+            \n5) save - Create a new archive and get the source code of this new archive for the supplied url."
+
+    return output
 
 
 def args_handler(args):
@@ -123,34 +126,34 @@ def args_handler(args):
             % __version__
         )
 
+    obj = Url(args.url)
     if args.user_agent:
         obj = Url(args.url, args.user_agent)
-    else:
-        obj = Url(args.url)
 
     if args.save:
-        return _save(obj)
-    if args.archive_url:
-        return _archive_url(obj)
-    if args.json:
-        return _json(obj)
-    if args.oldest:
-        return _oldest(obj)
-    if args.newest:
-        return _newest(obj)
-    if args.known_urls:
-        return _known_urls(obj, args)
-    if args.total:
-        return _total_archives(obj)
-    if args.near:
-        return _near(obj, args)
-    if args.get:
-        return _get(obj, args)
-    message = (
-        "You only specified the URL. But you also need to specify the operation."
-        "\nSee 'waybackpy --help' for help using this tool."
-    )
-    return message
+        output = _save(obj)
+    elif args.archive_url:
+        output = _archive_url(obj)
+    elif args.json:
+        output = _json(obj)
+    elif args.oldest:
+        output = _oldest(obj)
+    elif args.newest:
+        output = _newest(obj)
+    elif args.known_urls:
+        output = _known_urls(obj, args)
+    elif args.total:
+        output = _total_archives(obj)
+    elif args.near:
+        output = _near(obj, args)
+    elif args.get:
+        output = _get(obj, args)
+    else:
+        output = (
+            "You only specified the URL. But you also need to specify the operation."
+            "\nSee 'waybackpy --help' for help using this tool."
+        )
+    return output
 
 
 def parse_args(argv):

waybackpy/wrapper.py

@@ -64,7 +64,6 @@ class Url:
         self.url = url
         self.user_agent = user_agent
         self._url_check()  # checks url validity on init.
-        self.JSON = self._JSON()  # JSON of most recent archive
         self.archive_url = self._archive_url()  # URL of archive
         self.timestamp = self._archive_timestamp()  # timestamp for last archive
         self._alive_url_list = []
@@ -90,7 +89,8 @@ class Url:
         if "." not in self.url:
             raise URLError("'%s' is not a vaild URL." % self.url)
 
-    def _JSON(self):
+    @property
+    def JSON(self):
         endpoint = "https://archive.org/wayback/available"
         headers = {"User-Agent": "%s" % self.user_agent}
         payload = {"url": "%s" % self._clean_url()}