add zip compression and the ability to remove the logfiles

Signed-off-by: Sandmann79 <sandmann79@gmx.net>
Sandmann79 · Mar 21, 2023 · 5134659 · 5134659
1 parent 5eb4bfe
commit 5134659
Show file tree

Hide file tree

Showing 12 changed files with 50 additions and 6 deletions.
diff --git a/plugin.video.amazon-test/resources/language/resource.language.de_de/strings.po b/plugin.video.amazon-test/resources/language/resource.language.de_de/strings.po
@@ -817,4 +817,8 @@ msgstr "HTTP-Antwortinhalt loggen"
 
 msgctxt "#30275"
 msgid "Create Logfiles archive"
-msgstr "Logdateien-Archiv erstellen"
+msgstr "Logdateien-Archiv erstellen"
+
+msgctxt "#30276"
+msgid "Clear Logfiles"
+msgstr "Logdateien löschen"
diff --git a/plugin.video.amazon-test/resources/language/resource.language.en_gb/strings.po b/plugin.video.amazon-test/resources/language/resource.language.en_gb/strings.po
@@ -828,4 +828,8 @@ msgstr ""
 
 msgctxt "#30275"
 msgid "Create Logfiles archive"
+msgstr ""
+
+msgctxt "#30276"
+msgid "Clear Logfiles"
 msgstr ""
diff --git a/plugin.video.amazon-test/resources/language/resource.language.es_es/strings.po b/plugin.video.amazon-test/resources/language/resource.language.es_es/strings.po
@@ -819,3 +819,7 @@ msgstr ""
 msgctxt "#30275"
 msgid "Create Logfiles archive"
 msgstr ""
+
+msgctxt "#30276"
+msgid "Clear Logfiles"
+msgstr ""
diff --git a/plugin.video.amazon-test/resources/language/resource.language.fr_ca/strings.po b/plugin.video.amazon-test/resources/language/resource.language.fr_ca/strings.po
@@ -819,3 +819,7 @@ msgstr ""
 msgctxt "#30275"
 msgid "Create Logfiles archive"
 msgstr ""
+
+msgctxt "#30276"
+msgid "Clear Logfiles"
+msgstr ""
diff --git a/plugin.video.amazon-test/resources/language/resource.language.he_il/strings.po b/plugin.video.amazon-test/resources/language/resource.language.he_il/strings.po
@@ -824,3 +824,7 @@ msgstr ""
 msgctxt "#30275"
 msgid "Create Logfiles archive"
 msgstr ""
+
+msgctxt "#30276"
+msgid "Clear Logfiles"
+msgstr ""
diff --git a/plugin.video.amazon-test/resources/language/resource.language.hu_hu/strings.po b/plugin.video.amazon-test/resources/language/resource.language.hu_hu/strings.po
@@ -834,3 +834,7 @@ msgstr ""
 msgctxt "#30275"
 msgid "Create Logfiles archive"
 msgstr ""
+
+msgctxt "#30276"
+msgid "Clear Logfiles"
+msgstr ""
diff --git a/plugin.video.amazon-test/resources/language/resource.language.it_it/strings.po b/plugin.video.amazon-test/resources/language/resource.language.it_it/strings.po
@@ -818,3 +818,7 @@ msgstr ""
 msgctxt "#30275"
 msgid "Create Logfiles archive"
 msgstr ""
+
+msgctxt "#30276"
+msgid "Clear Logfiles"
+msgstr ""
diff --git a/plugin.video.amazon-test/resources/language/resource.language.pl_pl/strings.po b/plugin.video.amazon-test/resources/language/resource.language.pl_pl/strings.po
@@ -823,3 +823,7 @@ msgstr ""
 msgctxt "#30275"
 msgid "Create Logfiles archive"
 msgstr ""
+
+msgctxt "#30276"
+msgid "Clear Logfiles"
+msgstr ""
diff --git a/plugin.video.amazon-test/resources/language/resource.language.pt_pt/strings.po b/plugin.video.amazon-test/resources/language/resource.language.pt_pt/strings.po
@@ -835,3 +835,7 @@ msgstr ""
 msgctxt "#30275"
 msgid "Create Logfiles archive"
 msgstr ""
+
+msgctxt "#30276"
+msgid "Clear Logfiles"
+msgstr ""
diff --git a/plugin.video.amazon-test/resources/lib/logging.py b/plugin.video.amazon-test/resources/lib/logging.py
@@ -78,18 +78,23 @@ def LogJSON(o, comment=None, optionalName=None):
 
 
 def CreateZIP():
-    import os
-    from zipfile import ZipFile
+    from zipfile import ZipFile, ZIP_DEFLATED
     from datetime import datetime
     from .common import py2_decode, translatePath
 
     kodilog = OSPJoin(py2_decode(translatePath('special://logpath')), 'kodi.log')
     arcfile = OSPJoin(g.DATA_PATH, 'logfiles_{}.zip'.format(datetime.now().strftime('%Y%m%d-%H%M%S')))
-    arc = ZipFile(arcfile, 'w')
+    arc = ZipFile(arcfile, 'w', ZIP_DEFLATED)
 
-    for fn in os.listdir(g.LOG_PATH):
+    for fn in xbmcvfs.listdir(g.LOG_PATH)[1]:
         arc.write(OSPJoin(g.LOG_PATH, fn), arcname=(OSPJoin('log', fn)))
     arc.write(kodilog, arcname='kodi.log')
     arc.close()
     g.dialog.notification(g.__plugin__, 'Archive created at {}'.format(arcfile))
     Log('Archive created at {}'.format(arcfile), Log.DEBUG)
+
+
+def RemoveLogs():
+    for fn in xbmcvfs.listdir(g.LOG_PATH)[1]:
+        xbmcvfs.delete(OSPJoin(g.LOG_PATH, fn))
+    Log('Logfiles removed', Log.DEBUG)
diff --git a/plugin.video.amazon-test/resources/lib/startup.py b/plugin.video.amazon-test/resources/lib/startup.py
@@ -82,5 +82,7 @@ def EntryPoint():
         exec('{}()'.format(mode))
     elif mode in ['createzip']:
         CreateZIP()
+    elif mode in ['rmlogs']:
+        RemoveLogs()
     else:
         g.pv.Route(mode, args)
diff --git a/plugin.video.amazon-test/resources/settings.xml b/plugin.video.amazon-test/resources/settings.xml
@@ -126,6 +126,7 @@
         <setting id="json_dump_raw" type="bool" label="30199" default="false" enable="eq(-1,true)" subsetting="true"/>
         <setting id="json_dump_collisions" type="bool" label="30197" default="false" enable="eq(-2,true)" subsetting="true"/>
         <setting id="log_http" type="bool" label="30274" default="false"/>
-        <setting id="create_zip" label="30275" type="action" action="RunPlugin(plugin://plugin.video.amazon-test/?mode=createzip)" option="close"/>
+        <setting id="create_zip" label="30275" type="action" action="RunPlugin(plugin://plugin.video.amazon-test/?mode=createzip)"/>
+        <setting id="rm_logs" label="30276" type="action" action="RunPlugin(plugin://plugin.video.amazon-test/?mode=rmlogs)"/>
     </category>
 </settings>