add zero-length filter to textgenerator

Author: thurask

bbarchivist/textgenerator.py

@@ -27,7 +27,57 @@ def system_link_writer(target, urls, avlty=False):
             fsize = get_length(val)
         else:
             fsize = None
-        target.write("{0} [{1}] {2}\n".format(key, fsizer(fsize), val))
+        system_individual_writer(key, val, target, fsize)
+
+
+def get_fnone(fsize):
+    """
+    Get sentinel value for filesize when writing OS/radio links.
+
+    :param fsize: Filesize.
+    :type fsize: int
+    """
+    return True if fsize is None else False
+
+
+def system_individual_writer(appname, appurl, target, fsize):
+    """
+    Write individual OS/radio link to file.
+
+    :param appname: App name.
+    :type appname: str
+
+    :param appurl: App URL.
+    :type appurl: str
+
+    :param target: File to write to.
+    :type target: file
+
+    :param fsize: Filesize.
+    :type fsize: int
+    """
+    fnone = get_fnone(fsize)
+    if fnone:
+        target.write("{0} [{1}] {2}\n".format(appname, fsizer(0), appurl))
+    elif fsize > 0:
+        target.write("{0} [{1}] {2}\n".format(appname, fsizer(fsize), appurl))
+
+
+def app_individual_writer(app, target):
+    """
+    Write individual app link to file.
+
+    :param app: App URL.
+    :type app: str
+
+    :param target: File to write to.
+    :type target: file
+    """
+    fsize = get_length(app)
+    base = app.split('/')[-1]
+    base = stripper(base)
+    if fsize > 0:
+        target.write("{0} [{1}] {2}\n".format(base, fsizer(fsize), app))
 
 
 def app_link_writer(target, urls):
@@ -40,13 +90,10 @@ def app_link_writer(target, urls):
     :param urls: Dictionary of URLs; name: URL
     :type urls: dict(str: str)
     """
+    stoppers = ["8960", "8930", "8974", "m5730", "winchester"]
     for app in urls:
-        stoppers = ["8960", "8930", "8974", "m5730", "winchester"]
         if all(word not in app for word in stoppers):
-            fsize = get_length(app)
-            base = app.split('/')[-1]
-            base = stripper(base)
-            target.write("{0} [{1}] {2}\n".format(base, fsizer(fsize), app))
+            app_individual_writer(app, target)
 
 
 def dev_link_writer(target, finals):

tests/test_scriptutils.py

@@ -108,7 +108,7 @@ def test_cchecker_export_upgrade(self):
         """
         Test exporting links, with upgrade files.
         """
-        with mock.patch('bbarchivist.networkutils.get_length', mock.MagicMock(return_value=12345)):
+        with mock.patch('bbarchivist.textgenerator.get_fnone', mock.MagicMock(return_value=True)):
             bs.export_cchecker(
                 ["http://sn.ek"],
                 None,
@@ -119,7 +119,7 @@ def test_cchecker_export_upgrade(self):
                 True,
                 None)
             with open("10.3.3.3333plusapps.txt", "r") as afile:
-                assert len(afile.read()) == 2926
+                assert len(afile.read()) == 2899
 
     def test_cchecker_export_debrick(self):
         """

tests/test_textgenerator.py

@@ -3,6 +3,10 @@
 
 from shutil import rmtree
 import os
+try:
+    import unittest.mock as mock
+except ImportError:
+    import mock
 import httmock
 import bbarchivist.textgenerator as bt
 
@@ -44,7 +48,7 @@ def setup_class(cls):
         """
         Create necessary links.
         """
-        deb, cor, rad = bt.url_gen("10.1.1000", "10.2.2000", "10.3.3000")
+        deb, cor, rad = bt.url_gen("10.1.1.1000", "10.2.2.2000", "10.3.3.3000")
         cls.deb = deb
         cls.cor = cor
         cls.rad = rad
@@ -73,31 +77,32 @@ def test_write_links(self):
         """
         Test writing URLs to file.
         """
-        bt.write_links(
-            "10.3.3000",
-            "10.1.1000",
-            "10.2.2000",
-            self.deb,
-            self.cor,
-            self.rad,
-            True,
-            False,
-            None,
-            False,
-            None)
-        with open("10.3.3000.txt", 'rb') as file:
+        with mock.patch('bbarchivist.textgenerator.get_fnone', mock.MagicMock(return_value=True)):
+            bt.write_links(
+                "10.3.3.3000",
+                "10.1.1.1000",
+                "10.2.2.2000",
+                self.deb,
+                self.cor,
+                self.rad,
+                True,
+                False,
+                None,
+                False,
+                None)
+        with open("10.3.3.3000.txt", 'rb') as file:
             data = file.read()
             data = data.replace(b"\r", b"")
-            assert len(data) == 2848
+            assert len(data) == 2888
 
     def test_write_links_unavailable(self):
         """
         Test writing URLs, to file, if file existence not guaranteed.
         """
         bt.write_links(
-            "10.3.3000",
-            "10.1.1000",
-            "10.2.2000",
+            "10.3.3.3000",
+            "10.1.1.1000",
+            "10.2.2.2000",
             self.deb,
             self.cor,
             self.rad,
@@ -106,10 +111,10 @@ def test_write_links_unavailable(self):
             None,
             False,
             None)
-        with open("10.3.3000.txt", 'rb') as file:
+        with open("10.3.3.3000.txt", 'rb') as file:
             data = file.read()
             data = data.replace(b"\r", b"")
-            assert len(data) == 2878
+            assert len(data) == 2918
 
     def test_write_links_withapps(self):
         """
@@ -118,9 +123,9 @@ def test_write_links_withapps(self):
         apps = ["http://APP#1.bar", "http://APP#2.bar", "http://APP#3.bar"]
         with httmock.HTTMock(cl_good_mock):
             bt.write_links(
-                "10.3.3000",
-                "10.1.1000",
-                "10.2.2000",
+                "10.3.3.3000",
+                "10.1.1.1000",
+                "10.2.2.2000",
                 self.deb,
                 self.cor,
                 self.rad,
@@ -132,7 +137,7 @@ def test_write_links_withapps(self):
         with open("TEMPFILE.txt", 'rb') as file:
             data = file.read()
             data = data.replace(b"\r", b"")
-            assert len(data) == 3060
+            assert len(data) == 3100
 
     def test_export_devloader(self):
         """