Merge pull request #20 from kloptops/main

pugwash: fixed bug with port disk usage calculator, updated translations.

.gitignore

@@ -179,6 +179,7 @@ harbourmaster.txt
 PortMaster.zip
 pylibs.zip
 version
+do_test.sh
 
 # PortMaster Installer scripts.
 makeself*/

PortMaster/pugwash

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
 ## -- BEGIN PORTMASTER INFO --
-PORTMASTER_VERSION = '8.4.17'
+PORTMASTER_VERSION = '8.4.18'
 PORTMASTER_RELEASE_CHANNEL = 'beta'
 ## -- END PORTMASTER INFO --
 
@@ -309,19 +309,18 @@ class DirectoryScanner:
             return scan_info[0], True
 
     def _get_directory_size(self, path):
-        total_size = 0
-
         stack = [path]
 
         while len(stack) > 0:
+            total_size = 0
             path = stack.pop(0)
 
             if path.is_file():
                 total_size += entry.stat().st_size
 
             elif path.is_dir():
                 for entry in os.scandir(path):
-                    if entry.name.startswith('.'):
+                    if entry.name in ('.', '..'):
                         continue
 
                     elif entry.is_file():
@@ -330,9 +329,7 @@ class DirectoryScanner:
                     elif entry.is_dir():
                         stack.append(Path(entry.path))
 
-                yield total_size
-
-        yield total_size
+            yield total_size
 
     def _calculate_total_size(self, path):
         total_size = 0

PortMaster/pylibs/harbourmaster/util.py

@@ -51,7 +51,7 @@ def json_safe_load(*args):
 
 
 def fetch(url):
-    r = requests.get(url, timeout=10)
+    r = requests.get(url, timeout=20)
     if r.status_code != 200:
         logger.error(f"Failed to download {url!r}: {r.status_code}")
         return None
@@ -303,7 +303,7 @@ def download(file_name, file_url, md5_source=None, md5_result=None, callback=Non
         md5_result = [None]
 
     try:
-        r = requests.get(file_url, stream=True, timeout=(10, 5))
+        r = requests.get(file_url, stream=True, timeout=(30, 10))
 
         if r.status_code != 200:
             if callback is not None: