Merge pull request #289 from lxgr-linux/287-autogenerate-metainfo

Add pokete utility

.editorconfig

@@ -15,6 +15,9 @@ indent_size = 4
 tab_width = 4
 max_line_length = 80
 
+[*.xml]
+indent_style = tab
+
 [pokete_data/{map_data,npcs}.py]
 max_line_length = off
 

.gh-pages.json

@@ -49,16 +49,16 @@
     "convert_with_pandoc": true,
     "new_name": "DevGuide.html"
   },
-  "gen_wiki.py": {
+  "util.py": {
     "type": "documentation"
   },
   "pokete.py": {
     "type": "documentation"
   },
-  "prepare_pages.py": {
+  "pokete_general_use_fns.py": {
     "type": "documentation"
   },
-  "pokete_general_use_fns.py": {
+  "util/": {
     "type": "documentation"
   },
   "pokete_classes/": {

.github/workflows/documentation.yml

@@ -42,9 +42,9 @@ jobs:
 
       - name: Preprocess page files
         run: |
-          python3 ./prepare_pages.py before
+          python3 util.py prepare-pages before
           cp -r ./assets/ /tmp/assets
-          cp ./prepare_pages.py /tmp/prepare_pages.py
+          cp ./* /tmp/pokete
       - name: Switch branch to gh-pages
         uses: actions/checkout/@v2
         with:
@@ -53,7 +53,7 @@ jobs:
         run: |
           rm -rf ./assets ./wiki-multi
           mv '/tmp/assets/' .
-          python3 /tmp/prepare_pages.py after
+          python3 /tmp/pokete/util.py prepare-pages after
       # Push to github_pages
       - name: Release documentation
         run: |
@@ -98,7 +98,7 @@ jobs:
 
       - name: Make multipage wiki
         run: |
-          python3 gen_wiki.py verbose single multi pics
+          python3 util.py wiki --verbose --single --multi --pics
           mkdir /tmp/gen-wiki
           cp -r HowToPlay.md DevGuide.md wiki.md /tmp/gen-wiki
       - name: Switch to wiki repository

.github/workflows/main.yml

@@ -14,13 +14,13 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-        
+
       - name: install deps
         run: pip3 install scrap_engine
 
       - name: gen-wiki
-        run: python3 ./gen_wiki.py
-        
+        run: python3 util.py wiki
+
       - name: Commit files
         run: |
           git config --local user.name  ${{ github.actor }}
@@ -30,7 +30,7 @@ jobs:
             git add ./wiki.md
             git commit -m "Updated wiki"
           fi
-    
+
       - name: Push changes  # push the output folder to your repo
         uses: ad-m/github-push-action@master
         with:

Changelog.md

@@ -141,7 +141,8 @@ What changed until this release?
 - Added multipage wiki
 - Completely rewrote gen_wiki.py
 - Reformated, moved, outsourced, chnages a lot of code
-  Again special thanks to MaFeLP
+
+Again special thanks to MaFeLP
 
 ## [0.5.1] - 2021-09-19
 

README.md

@@ -163,8 +163,7 @@ On Windows `pynput` has to be installed too.
 
 - [Documentation for pokete_classes](https://lxgr-linux.github.io/pokete/doc/pokete_classes/index.html)
 - [Documentation for pokete_data](https://lxgr-linux.github.io/pokete/doc/pokete_data/index.html)
-- [Documentation for the gen-wiki file](https://lxgr-linux.github.io/pokete/doc/gen_wiki.html "gen_wiki.py")
-- [Documentation for the prepare_pages file](https://lxgr-linux.github.io/pokete/doc/prepare_pages.html "prepare_pages.py")
+- [Documentation for the util file](https://lxgr-linux.github.io/pokete/doc/util.html)
 - [Documentation for the pokete_general_use_fns](https://lxgr-linux.github.io/pokete/doc/pokete_general_use_fns.html "pokete_general_use_fns.py")
 - [Documentation for the main file "pokete.py"](https://lxgr-linux.github.io/pokete/doc/pokete.html "pokete.py")
 
@@ -182,7 +181,7 @@ To learn how to add more poketes/types/attacks to the game, see [the development
 After adding new Poketes and/or attacks you may want to run
 
 ```shell
-$ ./gen_wiki.py
+$ ./util.py wiki
 ```
 
 to regenerate the wiki and adding them to it.

assets/AppImageBuilder.yml

@@ -1,70 +1,53 @@
-# appimage-builder recipe see https://appimage-builder.readthedocs.io for details
-version: 1
-script:
-  - rm -rf AppDir | true
-  - mkdir -p AppDir/usr/share/icons
-  - git clone --depth=1 https://github.com/lxgr-linux/pokete AppDir/usr/share/pokete
-  - git clone --depth=1 https://github.com/lxgr-linux/scrap_engine AppDir/usr/share/scrap_engine
-  - cp AppDir/usr/share/scrap_engine/scrap_engine.py AppDir/usr/share/pokete/
-  - cp AppDir/usr/share/pokete/assets/pokete.svg AppDir/usr/share/icons/pokete.svg
-
 AppDir:
-  path: AppDir
   app_info:
-    id: com.github.lxgr-linux.pokete
-    name: Pokete
-    icon: pokete
-    version: 0.8.0
     exec: usr/bin/python3.10
-    exec_args: $APPDIR/usr/share/pokete/pokete.py --log $@
-  # pacman:
-  #   include:
-  #     - python
-  #   exclude: []
+    exec_args: $APPDIR/usr/bin/pokete.py --log $@
+    icon: com.github.lxgr_linux.pokete
+    id: com.github.lxgr_linux.pokete
+    name: Pokete
+    version: 0.9.2
   apt:
     arch: amd64
-    sources:
-      - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse'
-        key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c'
-    include:
-      - python3.10
     exclude:
-      - perl
-      - gcc-12-base
+    - perl
+    - gcc-12-base
+    include:
+    - python3.10
+    sources:
+    - key_url: https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c
+      sourceline: deb [arch=amd64] https://archive.ubuntu.com/ubuntu/ jammy main restricted
+        universe multiverse
   files:
-    include: []
     exclude:
-      - usr/share/man
-      - usr/share/pokete/bash
-      - usr/share/pokete/.git
-      - usr/share/pokete/prepare_pages.py
-      - usr/share/pokete/gen_wiki.py./
-      - usr/share/pokete/*.md
-      - usr/share/scrap_engine
-      - usr/share/pokete/playsound/libplaysound.dll
-      - usr/share/pokete/playsound/libplaysound.osx.so
-      - usr/share/pokete/assets/ss
-      - usr/share/pokete/assets/*.png
-      - usr/share/pokete/assets/*.kra
-      - usr/share/pokete/assets/*.svg
-      - usr/share/doc
+    - pokete
+    - usr/share/scrap_engine
+    - usr/share/pokete/playsound/libplaysound.dll
+    - usr/share/pokete/playsound/libplaysound.osx.so
+    include: []
+  path: AppDir
   test:
-    fedora-30:
-      image: appimagecrafters/tests-env:fedora-30
-      command: ./AppRun
-    debian-stable:
-      image: appimagecrafters/tests-env:debian-stable
-      command: ./AppRun
     archlinux-latest:
-      image: appimagecrafters/tests-env:archlinux-latest
       command: ./AppRun
+      image: appimagecrafters/tests-env:archlinux-latest
     centos-7:
+      command: ./AppRun
       image: appimagecrafters/tests-env:centos-7
+    debian-stable:
       command: ./AppRun
+      image: appimagecrafters/tests-env:debian-stable
+    fedora-30:
+      command: ./AppRun
+      image: appimagecrafters/tests-env:fedora-30
     ubuntu-xenial:
-      image: appimagecrafters/tests-env:ubuntu-xenial
       command: ./AppRun
+      image: appimagecrafters/tests-env:ubuntu-xenial
 AppImage:
   arch: x86_64
   comp: gzip
   update-information: guess
+script:
+- rm -rf AppDir | true
+- git clone --depth=1 https://github.com/lxgr-linux/pokete
+- git clone --depth=1 https://github.com/lxgr-linux/scrap_engine AppDir/usr/share/scrap_engine
+- cd ./pokete && python3.10 ./util.py install AppDir/usr
+version: 1

assets/pokete.desktop → assets/com.github.lxgr_linux.pokete.desktop

@@ -4,7 +4,7 @@ Type=Application
 Name=Pokete
 Comment=A terminal based Pokemon clone, based on the scrap engine.
 Exec=/usr/bin/pokete.py
-Icon=/usr/share/pokete/assets/pokete.png
+Icon=com.github.lxgr_linux.pokete
 Terminal=true
 StartupNotify=false
 Categories=Game;