MediaWikiServerTools 0.2.0__tar.gz → 0.2.3__tar.gz

{mediawikiservertools-0.2.0 → mediawikiservertools-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MediaWikiServerTools
-Version: 0.2.0
+Version: 0.2.3
 Summary: MediaWikiServerTools: MediaWiki Server Management System
 Project-URL: Home, https://github.com/BITPlan/MediaWikiServerTools
 Project-URL: Source, https://github.com/BITPlan/MediaWikiServerTools

mediawikiservertools-0.2.3/mwstools_backend/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.2.3"

{mediawikiservertools-0.2.0 → mediawikiservertools-0.2.3}/mwstools_backend/tsite.py

@@ -89,16 +89,14 @@ class TransferTask:
     def login(self):
         """
         login to the source wiki
+
+        use WikiClient.login() which goes through the legacy action=login API.
+        This works reliably across MediaWiki versions (e.g. 1.35.5) for both
+        bot and regular users, whereas site.clientlogin() fails with
+        "Incorrect username or password entered" on some wikis (see issue #5).
         """
-        wu = self.wikiUser
-        # bot login
-        if "@" in wu.user:
-            self.wikiClient.login()
-        else:
-            # just fake a compatible version to allow client login
-            self.site.version = (1, 35, 5)
-            self.site.clientlogin(username=wu.user, password=wu.get_password())
-        pass
+        if not self.wikiClient.login():
+            raise Exception(f"login to {self.wikiUser.wikiId} failed")
 
     def git_target(self, target_path: str) -> subprocess.CompletedProcess:
         """
@@ -187,6 +185,7 @@ class TransferTask:
         if self.source.sitedir is not None:
             site_path = f"{self.source.sitedir}/{self.wiki_site.hostname}"
             print(f"site sync check {site_path}...")
+            self.target.remote.run_config.timeout = self.timeout
             marker_file = ".sync_done"
             source_path = f"{self.source.hostname}:{site_path}"
             run_config = RunConfig(
@@ -303,7 +302,12 @@ class TransferTask:
                     restore_cmd = (
                         f"pv {self.target_backup_path} | {mysqlr} -D {database}"
                     )
-                    proc = self.target.remote.run(restore_cmd)
+                    # honor the user supplied --timeout for the (potentially long)
+                    # SQL restore instead of the 10s RunConfig default (closes #6)
+                    restore_run_config = RunConfig(timeout=self.timeout)
+                    proc = self.target.remote.run(
+                        restore_cmd, run_config=restore_run_config
+                    )
                     success = proc.returncode == 0
                     result = result and success
                     if success:

{mediawikiservertools-0.2.0 → mediawikiservertools-0.2.3}/mwstools_backend/version.py

@@ -18,7 +18,7 @@ class Version(object):
     description = "MediaWiki Server Management System - Apache Site management, SQL backups, cron-based backups "
     version = mwstools_backend.__version__
     date = "2022-11-16"
-    updated = "2026-06-05"
+    updated = "2026-06-07"
     authors = "Wolfgang Fahl"
     doc_url = "https://wiki.bitplan.com/index.php/MediaWikiServerTools"
     chat_url = "https://github.com/WolfgangFahl/MediaWikiServerTools/discussions"

mediawikiservertools-0.2.0/mwstools_backend/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.2.0"