MediaWikiServerTools 0.2.1__tar.gz → 0.2.6__tar.gz

{mediawikiservertools-0.2.1 → mediawikiservertools-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: MediaWikiServerTools
-Version: 0.2.1
+Version: 0.2.6
 Summary: MediaWikiServerTools: MediaWiki Server Management System
 Project-URL: Home, https://github.com/BITPlan/MediaWikiServerTools
 Project-URL: Source, https://github.com/BITPlan/MediaWikiServerTools
@@ -22,6 +22,7 @@ Requires-Dist: beautifulsoup4>=4.9.3
 Requires-Dist: lxml
 Requires-Dist: py-3rdparty-mediawiki>=0.19.4
 Requires-Dist: pybasemkit>=0.2.4
+Requires-Dist: pyexpirebackups>=0.1.3
 Requires-Dist: pymogwai>=0.1.1
 Requires-Dist: pymysql>=1.1.1
 Provides-Extra: test

mediawikiservertools-0.2.6/mwstools_backend/__init__.py

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

{mediawikiservertools-0.2.1 → mediawikiservertools-0.2.6}/mwstools_backend/remote.py

@@ -547,11 +547,24 @@ class Remote:
             self.log.log("✅", "sync", f"{marker_path} already exists")
             return subprocess.CompletedProcess([], 0, "", "")
         proc = self.prepare_target_directory(target_path, run_config)
+        if proc.returncode == 0 and run_config.should_set_permissions:
+            # make the existing target tree group-writable BEFORE rsync so the
+            # rsync receiver (running as a www-data group member) can create its
+            # temp files in pre-existing images/* subdirs (closes #9).
+            # g+rwX adds execute only on directories, leaving files non-executable.
+            target_on_host = self.get_path_on_target(target_path)
+            if self.get_file_stats(target_on_host) is not None:
+                pre_perm_cmds = {
+                    "chown_tree": f"sudo chown -R {run_config.uid}:{run_config.gid} {target_path}",
+                    "chmod_tree": f"sudo chmod -R g+rwX {target_path}",
+                }
+                proc = self.run_cmds_as_single_cmd(pre_perm_cmds)
         if proc.returncode == 0:
             timeout = run_config.timeout if run_config else 30
             rsync_cmd = (
                 f"rsync -avz --no-perms --omit-dir-times --timeout={timeout} {source_path}/* {target_path}"
             )
+            print(f"⚙️ {rsync_cmd}")
             proc = self.run(rsync_cmd, run_config=run_config)
 
         if run_config.should_set_permissions and proc.returncode == 0:
@@ -564,8 +577,15 @@ class Remote:
         if proc.returncode == 0:
             self.run(f"touch {marker_path}")
 
-        status = "✅" if proc.returncode == 0 else "❌"
-        self.log.log(status, "sync", f"synching {message}")
+        success = proc.returncode == 0
+        status = "✅" if success else "❌"
+        message = f"synching {message}"
+        if not success:
+            # surface the real rsync error instead of swallowing it (closes #8)
+            message += (
+                f" failed (rc={proc.returncode})\n{proc.stdout}\n{proc.stderr}"
+            )
+        self.log.log(status, "sync", message)
 
         return proc
 

{mediawikiservertools-0.2.1 → mediawikiservertools-0.2.6}/mwstools_backend/tsite.py

@@ -5,6 +5,8 @@ Tools to transfer a mediawiki site from one server to another
 to e.g. migrate the LAMP stack elements or move from a farm based
 to a dockerized environment
 
+see also https://www.semantic-mediawiki.org/wiki/SMWCon_Fall_2020/Mediawiki_1.35_Migration
+
 @author: wf
 """
 
@@ -89,16 +91,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:
         """
@@ -200,6 +200,7 @@ class TransferTask:
                 uid=33,  # www-data
                 gid=33,  # www-data
             )
+            rsync_prof = Profiler("rsync sync", profile=self.args.profile)
             proc = self.target.remote.rsync(
                 source_path=source_path,
                 target_path=site_path,
@@ -207,13 +208,20 @@ class TransferTask:
                 message=f"{self.wiki_site.hostname}",
                 run_config=run_config,
             )
-            if proc.returncode == 0:
-                print("✅ sync done")
-                result = True
+            if proc.returncode != 0:
+                # abort on rsync failure - do not proceed to git (closes #8)
+                print(
+                    f"❌ rsync sync {self.wiki_site.hostname} failed"
+                    f" (rc={proc.returncode})\n{proc.stdout}\n{proc.stderr}"
+                )
+                return False
+            rsync_prof.time(f" {self.wiki_site.hostname}")
+            result = True
             if self.use_git:
+                git_prof = Profiler("git commit", profile=self.args.profile)
                 proc = self.git_target(target_path=site_path)
                 if proc.returncode == 0:
-                    print("✅ git committed")
+                    git_prof.time(f" {self.wiki_site.hostname}")
                 else:
                     result = False
         return result
@@ -304,7 +312,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.1 → mediawikiservertools-0.2.6}/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-10"
     authors = "Wolfgang Fahl"
     doc_url = "https://wiki.bitplan.com/index.php/MediaWikiServerTools"
     chat_url = "https://github.com/WolfgangFahl/MediaWikiServerTools/discussions"

{mediawikiservertools-0.2.1 → mediawikiservertools-0.2.6}/pyproject.toml

@@ -30,6 +30,9 @@ dependencies = [
     'PyMySQL>=1.1.1',
     # https://pypi.org/project/pyMogwai/
     "pyMogwai>=0.1.1",
+    # https://pypi.org/project/pyExpireBackups/
+    # provides the `expirebackups` module imported by mwstools_backend.cron_backup (issue #10)
+    "pyExpireBackups>=0.1.3",
 ]
 
 requires-python = ">=3.10"

mediawikiservertools-0.2.1/mwstools_backend/__init__.py

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