FIX! world directory

[dotfiles.git] / invoke / luanti-remote / tasks.py

diff --git a/invoke/luanti-remote/tasks.py b/invoke/luanti-remote/tasks.py
index 02ea82977673e66469f7e604d94331d1e67d9a80..cc305f39918c880154bb0340ce8f1e07d5ce0adf 100644 (file)
--- a/invoke/luanti-remote/tasks.py
+++ b/invoke/luanti-remote/tasks.py
@@ -1,4 +1,5 @@
 from invoke import task
+from invoke import tasks
 import os
 from datetime import datetime as dt
 
@@ -10,6 +11,7 @@ TODAY = dt.now().strftime('%Y.%m.%d')
 
 WORLD='world'  # World folder
 
+USER_AT_IP=f'{USER}@{IP}'
 SSH=f'ssh {USER}@{IP}'
 SCP=f'scp {USER}@{IP}'
 BACKUP_FILE=f'world.{TODAY}.tar'
@@ -17,6 +19,9 @@ LOCAL_BACKUPS=f'{LOCAL_HOME}/backup/luanti'
 
 LUANTI=f'{HOME}/luanti'
 MODS=f'{LUANTI}/mods'
+WORLDS=f'{LUANTI}/worlds'
+
+
 SERVE=f'screen -d -m {LUANTI}/bin/luantiserver --gameid minetest --worldname world'
 
 def browse(c, url):
@@ -33,11 +38,15 @@ def lookup_mod(c, mod):
 @task
 def backup_mod(c, mod):
     c.run(f'mkdir -p {LOCAL_BACKUPS}/mods')
-    tarfile = f'/tmp/{mod}.tar'
+    tmpdir = '/tmp/mod_backups'
+    c.run(f'{SSH} -C mkdir -p {tmpdir}')
+    tarfile = f'{tmpdir}/{mod}.tar'
     c.run(f'{SSH} -C rm -f {tarfile} 2> /dev/null')
-    c.run(f'{SSH} -C tar cf {tarfile} {MODS}/{mod}')
+    c.run(f'{SSH} -C tar cf {tarfile} --directory {MODS} {mod}')
     c.run(f'{SCP}:{tarfile} {LOCAL_BACKUPS}/mods')
     c.run(f'ls -l {LOCAL_BACKUPS}/mods')
+    c.run(f'tar --list -f {LOCAL_BACKUPS}/mods/{mod}.tar | tail')
+    c.run(f'tar --list -f {LOCAL_BACKUPS}/mods/{mod}.tar | wc')
 
 @task
 def unpack_mod(c, mod):
@@ -48,12 +57,36 @@ def unpack_mod(c, mod):
     c.run(f'cd {unpack}; tar xf {unpack}/{mod}.tar')
     c.run(f'ls {unpack}')
 
+updated_mods = f'{LOCAL_BACKUPS}/updated_mods'
+
+@task
+def repack_mod(c, mod):
+    unpacked_mods = f'{LOCAL_BACKUPS}/mods/unpack/'
+    tarfile = f'{updated_mods}/{mod}.tar'
+    c.run(f'tar cf {tarfile} --directory={unpacked_mods} {mod}')
+    c.run(f'mkdir -p {updated_mods}')
+    c.run(f'ls -l {updated_mods}')
+    c.run(f'tar --list -f {updated_mods}/{mod}.tar | tail')
+    c.run(f'tar --list -f {updated_mods}/{mod}.tar | wc')
+
+# @task(pre=[tasks.call(backup_mod, mod=mod)])
+@task
+def push_updated_mod(c, mod):
+    tmpdir = '/tmp/updated_mods'
+    c.run(f'{SSH} -C mkdir -p {tmpdir}')
+    c.run(f'scp {updated_mods}/{mod}.tar {USER_AT_IP}:{tmpdir}')
+    c.run(f'{SSH} -C ls -al {tmpdir}')
+    c.run(f'{SSH} -C tar --list -f {tmpdir}/{mod}.tar')
+    c.run(f'{SSH} -C mv {MODS}/{mod} /tmp/{mod}.{TODAY}.bk')
+    c.run(f'{SSH} -C tar xf {tmpdir}/{mod}.tar --directory {MODS}')
+    c.run(f'{SSH} -C ls -l {MODS}/{mod}')
+
 
 @task
-def compress(c):
-    c.run(f'{SSH} -C tar cf {HOME}/{BACKUP_FILE} --directory={HOME} {WORLD}')
+def compress_world(c):
+    c.run(f'{SSH} -C tar cf {HOME}/{BACKUP_FILE} --directory={WORLDS} {WORLD}')
 
-@task(compress)
+@task(compress_world)
 def backup(c):
     stopped = input("Is the server stopped?")
     if(stopped != 'y'):
@@ -63,7 +96,7 @@ def backup(c):
     c.run(f'mkdir -p {LOCAL_BACKUPS}')
     c.run(f'{SCP}:{BACKUP_FILE} {LOCAL_BACKUPS}')
     print(f'Backedup up {BACKUP_FILE} to {LOCAL_BACKUPS}')
-    c.run(f'ls {LOCAL_BACKUPS} | grep world')
+    c.run(f'ls -lh {LOCAL_BACKUPS} | grep {WORLD}')
     c.run(f'tar tvf {LOCAL_BACKUPS}/{BACKUP_FILE}')