From a4d367e4fb152f25b516288e808527cc1008bbee Mon Sep 17 00:00:00 2001 From: Mario Voigt Date: Mon, 7 Nov 2022 23:48:48 +0100 Subject: [PATCH] update some json; add back updater extension --- .../about_upgrade_mightyscape.inx | 48 +++++ .../about_upgrade_mightyscape.py | 179 ++++++++++++++++++ .../about_upgrade_mightyscape/meta.json | 20 ++ .../ai_compatible_eps_output/meta.json | 4 +- .../contour_scanner_and_trimmer/meta.json | 6 +- .../fablabchemnitz/dxf_dwg_importer/meta.json | 6 +- .../fablabchemnitz/laser_check/meta.json | 4 +- .../stroke_font_creator/meta.json | 4 +- .../fablabchemnitz/svgo_output/meta.json | 4 +- 9 files changed, 261 insertions(+), 14 deletions(-) create mode 100644 extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.inx create mode 100644 extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.py create mode 100644 extensions/fablabchemnitz/about_upgrade_mightyscape/meta.json diff --git a/extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.inx b/extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.inx new file mode 100644 index 0000000..fa46d65 --- /dev/null +++ b/extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.inx @@ -0,0 +1,48 @@ + + + About/Upgrade MightyScape + fablabchemnitz.de.about_upgrade_mightyscape + + + + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + ../000_about_fablabchemnitz.svg + + + + all + + + + + + \ No newline at end of file diff --git a/extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.py b/extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.py new file mode 100644 index 0000000..afc8416 --- /dev/null +++ b/extensions/fablabchemnitz/about_upgrade_mightyscape/about_upgrade_mightyscape.py @@ -0,0 +1,179 @@ +#!/usr/bin/env python3 + +""" +Upgrade MightyScape from Inkscape Extension Dialog. Made for end users + +Extension for InkScape 1.2.1 +Author: Mario Voigt / FabLab Chemnitz +Mail: mario.voigt@stadtfabrikanten.org +Date: 14.05.2021 +Last patch: 07.11.2022 +License: GNU GPL v3 + +ToDo + - add routine to check for differences between remotes (unequal commits) +""" + +import inkex +import os +import warnings +from datetime import datetime + +try: + import git + from git import Repo #requires GitPython lib +except: + inkex.utils.debug("Error. GitPython was not installed but is required to run the upgrade process!") + exit(1) + +class AboutUpgradeMightyScape(inkex.EffectExtension): + + def update(self, local_repo, remote, localCommitCount): + inkex.utils.debug("Chosen remote is: {}".format(remote)) + try: + localCommit = local_repo.head.commit + remote_repo = git.remote.Remote(local_repo, remote) + remoteCommit = remote_repo.fetch()[0].commit + inkex.utils.debug("Latest remote commit is: " + str(remoteCommit)[:7]) + remoteCommitCount = 0 + for c in remote_repo.repo.iter_commits('origin/master'): + remoteCommitCount += 1 + inkex.utils.debug("Commits at remote: {}".format(remoteCommitCount)) + + if localCommit.hexsha != remoteCommit.hexsha: + ssh_executable = 'git' + with local_repo.git.custom_environment(GIT_SSH=ssh_executable): + #origin = local_repo.remotes.origin + #origin.fetch() + #fetch_info = origin.pull() #finally pull new data + fetch_info = remote_repo.fetch() + remote_repo.pull() #finally pull new data + + for info in fetch_info: #should return only one line in total + inkex.utils.debug("Updated {} to commit id {}. {} commits were pulled".format(info.ref, str(info.commit)[:7], remoteCommitCount - localCommitCount)) + + inkex.utils.debug("Please restart Inkscape to let the changes take effect.") + + else: + inkex.utils.debug("Nothing to do! MightyScape is already up to date!") + + except git.exc.GitCommandError as e: + inkex.utils.debug("Error: ") + inkex.utils.debug(e) + return False + return True + + + def add_arguments(self, pars): + pars.add_argument("--tab") + pars.add_argument("--convert_to_git", type=inkex.Boolean, default=False, help="If you downloaded MightyScape as .zip or .tar.gz you cannot upgrade using this extension. But you can convert your downloaded directory to a .git one by enabling this option") + pars.add_argument("--recreate_remotes", type=inkex.Boolean, default=False, help="Update remotes in git config file (useful if you have an older version of MightyScape or if sth. changes)") + pars.add_argument("--stash_untracked", type=inkex.Boolean, default=False, help="Stash untracked files and continue to upgrade") + + + def effect(self): + + global so + so = self.options + + warnings.simplefilter('ignore', ResourceWarning) #suppress "enable tracemalloc to get the object allocation traceback" + + #get the directory of mightyscape + extension_dir = os.path.abspath(os.path.join(os.path.abspath(os.path.dirname(__file__)), '../')) #go up to main dir /home//.config/inkscape/extensions/mightyscape-1.2/ + main_dir = os.path.abspath(os.path.join(extension_dir, '../../')) #go up to main dir /home//.config/inkscape/extensions/mightyscape-1.2/ + + #create some statistics + totalFolders = 0 + for root, folders, files in os.walk(extension_dir): + totalFolders += len(folders) + break #prevent descending into subfolders + + totalInx = 0 + for root, folders, files in os.walk(extension_dir): + for file in files: + if file.endswith('.inx'): + totalInx += 1 + + inkex.utils.debug("Locally there are {} extension folders with {} .inx files!\n".format(totalFolders, totalInx)) + + remotes = [] + remotes.append(["https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2.git", "origin"]) #main + remotes.append(["https://github.com/eridur-de/mightyscape-1.2.git", "github"]) #copy/second remote + + gitDir = os.path.join(main_dir, ".git") + + if not os.path.exists(gitDir): + if so.convert_to_git is True: + local_repo = Repo.init(main_dir) + local_repo.git.add(all=True) + localRemotes = [] + for remote in remotes: + localRemotes.append(local_repo.create_remote(remote[1], url=remote[0])) + localRemotes[0].update() + local_repo.index.commit('.') + local_repo.git.checkout('origin/master') + else: + inkex.utils.debug("MightyScape .git directory was not found. It seems you installed MightyScape the traditional way (by downloading and extracting from archive). Please install MightyScape using the git clone method if you want to use the upgrade function. More details can be found in the official README.") + exit(1) + + local_repo = Repo(gitDir) + + #drop local changed. update might fail if file changes are present + if so.stash_untracked is True: + local_repo.git.stash('save') + + existingRemotes = [] #check for existing remotes. if one is missing, add it (or delete and recreate) + for r in local_repo.remotes: + existingRemotes.append(str(r)) + for remote in remotes: + if remote[1] not in existingRemotes: + local_repo.create_remote(remote[1], url=remote[0]) + if so.recreate_remotes is True: #delete and then recreate + local_repo.delete_remote(remote[1]) + local_repo.create_remote(remote[1], url=remote[0]) + + #check if it is a non-empty git repository + if local_repo.bare is False: + if local_repo.is_dirty(untracked_files=True) is False: + if len(local_repo.untracked_files) > 0: + if so.stash_untracked is True: + local_repo.git.stash('save') + else: + inkex.utils.debug("There are some untracked files in your MightyScape directory. Still trying to pull recent files from git...") + + localLatestCommit = local_repo.head.commit + localCommits = list(local_repo.iter_commits("origin/master", skip=0)) + localCommitCount = len(localCommits) + inkex.utils.debug("Local commit id is: " + str(localLatestCommit)[:7]) + inkex.utils.debug("There are {} local commits at the moment.".format(localCommitCount)) + localCommits = localCommits[:10] #get only last ten commits + localCommitList = [] + for localCommit in localCommits: + localCommitList.append(localCommit) + #localCommitList.reverse() + inkex.utils.debug("*"*40) + inkex.utils.debug("Latest {} local commits are:".format(len(localCommits))) + for i in range(0, len(localCommits)): + inkex.utils.debug("{} | {} : {}".format( + datetime.utcfromtimestamp(localCommitList[i].committed_date).strftime('%Y-%m-%d %H:%M:%S'), + localCommitList[i].name_rev[:7], + localCommitList[i].message.strip()) + ) + #inkex.utils.debug(" - {}: {}".format(localCommitList[i].newhexsha[:7], localCommitList[i].message)) + inkex.utils.debug("*"*40) + + #finally run the update + success = self.update(local_repo, remotes[0][1], localCommitCount) + if success is False: #try the second remote if first failed + inkex.utils.debug("Error receiving latest remote commit from main git remote {}. Trying second remote ...".format(remotes[0][0])) + success = self.update(local_repo, remotes[1][1], localCommitCount) + if success is False: #if still false: + inkex.utils.debug("Error receiving latest remote commit from second git remote {}.\nAre you offline? Cannot continue!".format(remotes[0][0])) + exit(1) + + else: + inkex.utils.debug("No \".git\" directory found. Seems your MightyScape was not installed with git clone. Please see documentation on how to do that.") + exit(1) + +if __name__ == '__main__': + AboutUpgradeMightyScape().run() \ No newline at end of file diff --git a/extensions/fablabchemnitz/about_upgrade_mightyscape/meta.json b/extensions/fablabchemnitz/about_upgrade_mightyscape/meta.json new file mode 100644 index 0000000..aa421ef --- /dev/null +++ b/extensions/fablabchemnitz/about_upgrade_mightyscape/meta.json @@ -0,0 +1,20 @@ +[ + { + "name": "About/Upgrade MightyScape", + "id": "fablabchemnitz.de.about_upgrade_mightyscape", + "path": "about_upgrade_mightyscape", + "dependent_extensions": null, + "original_name": "About/Upgrade MightyScape", + "original_id": "fablabchemnitz.de.about_upgrade_mightyscape", + "license": "GNU GPL v3", + "license_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2/src/branch/master/LICENSE", + "comment": "", + "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2/src/branch/master/extensions/fablabchemnitz/about_upgrade_mightyscape", + "fork_url": null, + "documentation_url": "https://stadtfabrikanten.org/display/IFM/MightyScape+1.X+-+Introduction+and+Installation", + "inkscape_gallery_url": null, + "main_authors": [ + "github.com/eridur-de" + ] + } +] \ No newline at end of file diff --git a/extensions/fablabchemnitz/ai_compatible_eps_output/meta.json b/extensions/fablabchemnitz/ai_compatible_eps_output/meta.json index d96b605..669116b 100644 --- a/extensions/fablabchemnitz/ai_compatible_eps_output/meta.json +++ b/extensions/fablabchemnitz/ai_compatible_eps_output/meta.json @@ -9,13 +9,13 @@ "license": "MIT License", "license_url": "https://github.com/tzunghaor/inkscape-eps-export/blob/master/aieps_output.py", "comment": "", - "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.X/src/branch/master/extensions/fablabchemnitz/ai_compatible_eps_output", + "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2/src/branch/master/extensions/fablabchemnitz/ai_compatible_eps_output", "fork_url": "https://github.com/tzunghaor/inkscape-eps-export", "documentation_url": "https://stadtfabrikanten.org/pages/viewpage.action?pageId=55018922&searchId=UF0RDT9E0", "inkscape_gallery_url": null, "main_authors": [ "github.com/tzunghaor", - "github.com/vmario89" + "github.com/eridur-de" ] } ] \ No newline at end of file diff --git a/extensions/fablabchemnitz/contour_scanner_and_trimmer/meta.json b/extensions/fablabchemnitz/contour_scanner_and_trimmer/meta.json index a57397f..3abbedf 100644 --- a/extensions/fablabchemnitz/contour_scanner_and_trimmer/meta.json +++ b/extensions/fablabchemnitz/contour_scanner_and_trimmer/meta.json @@ -7,14 +7,14 @@ "original_name": "Contour Scanner And Trimmer", "original_id": "fablabchemnitz.de.contour_scanner_and_trimmer", "license": "GNU GPL v3", - "license_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.X/src/branch/master/LICENSE", + "license_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2/src/branch/master/LICENSE", "comment": "Written by Mario Voigt from scratch with a lot of help using other extensions as template", - "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.X/src/branch/master/extensions/fablabchemnitz/contour_scanner_and_trimmer", + "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2/src/branch/master/extensions/fablabchemnitz/contour_scanner_and_trimmer", "fork_url": null, "documentation_url": "https://stadtfabrikanten.org/display/IFM/Contour+Scanner+And+Trimmer", "inkscape_gallery_url": "https://inkscape.org/de/~MarioVoigt/%E2%98%85contour-scanner-and-trimmer", "main_authors": [ - "github.com/vmario89" + "github.com/eridur-de" ] } ] \ No newline at end of file diff --git a/extensions/fablabchemnitz/dxf_dwg_importer/meta.json b/extensions/fablabchemnitz/dxf_dwg_importer/meta.json index 622536d..9a2ca9e 100644 --- a/extensions/fablabchemnitz/dxf_dwg_importer/meta.json +++ b/extensions/fablabchemnitz/dxf_dwg_importer/meta.json @@ -7,14 +7,14 @@ "original_name": "DXF/DWG Importer", "original_id": "fablabchemnitz.de.dxf_dwg_importer", "license": "GNU GPL v3", - "license_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.X/src/branch/master/LICENSE", + "license_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2/src/branch/master/LICENSE", "comment": "Written by Mario Voigt", - "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.X/src/branch/master/extensions/fablabchemnitz/dxf_dwg_importer", + "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2/src/branch/master/extensions/fablabchemnitz/dxf_dwg_importer", "fork_url": null, "documentation_url": "https://stadtfabrikanten.org/pages/viewpage.action?pageId=78807535", "inkscape_gallery_url": "https://inkscape.org/~MarioVoigt/%E2%98%85dxfdwg-importer", "main_authors": [ - "github.com/vmario89" + "github.com/eridur-de" ] } ] \ No newline at end of file diff --git a/extensions/fablabchemnitz/laser_check/meta.json b/extensions/fablabchemnitz/laser_check/meta.json index 0255886..5f6906d 100644 --- a/extensions/fablabchemnitz/laser_check/meta.json +++ b/extensions/fablabchemnitz/laser_check/meta.json @@ -9,12 +9,12 @@ "license": "GNU GPL v3", "license_url": "", "comment": "", - "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.X/src/branch/master/extensions/fablabchemnitz/laser_check", + "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2/src/branch/master/extensions/fablabchemnitz/laser_check", "fork_url": null, "documentation_url": "https://stadtfabrikanten.org/display/IFM/Laser+Check", "inkscape_gallery_url": null, "main_authors": [ - "github.com/vmario89" + "github.com/eridur-de" ] } ] \ No newline at end of file diff --git a/extensions/fablabchemnitz/stroke_font_creator/meta.json b/extensions/fablabchemnitz/stroke_font_creator/meta.json index 0368b2b..9a944d9 100644 --- a/extensions/fablabchemnitz/stroke_font_creator/meta.json +++ b/extensions/fablabchemnitz/stroke_font_creator/meta.json @@ -9,13 +9,13 @@ "license": "GNU GPL v2", "license_url": "https://github.com/Shriinivas/inkscapestrokefont/blob/master/LICENSE", "comment": "", - "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.X/src/branch/master/extensions/fablabchemnitz/stroke_font_creator", + "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2/src/branch/master/extensions/fablabchemnitz/stroke_font_creator", "fork_url": "https://github.com/Shriinivas/inkscapestrokefont", "documentation_url": "https://stadtfabrikanten.org/display/IFM/Stroke+Font+Creator", "inkscape_gallery_url": null, "main_authors": [ "github.com/Shriinivas", - "github.com/vmario89" + "github.com/eridur-de" ] } ] \ No newline at end of file diff --git a/extensions/fablabchemnitz/svgo_output/meta.json b/extensions/fablabchemnitz/svgo_output/meta.json index 311c6d9..dbb6f76 100644 --- a/extensions/fablabchemnitz/svgo_output/meta.json +++ b/extensions/fablabchemnitz/svgo_output/meta.json @@ -9,13 +9,13 @@ "license": "MIT License", "license_url": "https://github.com/juanfran/svgo-inkscape/blob/master/LICENSE", "comment": "", - "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.X/src/branch/master/extensions/fablabchemnitz/svgo_output", + "source_url": "https://gitea.fablabchemnitz.de/FabLab_Chemnitz/mightyscape-1.2/src/branch/master/extensions/fablabchemnitz/svgo_output", "fork_url": "https://github.com/juanfran/svgo-inkscape/", "documentation_url": "https://stadtfabrikanten.org/pages/viewpage.action?pageId=55019653", "inkscape_gallery_url": null, "main_authors": [ "github.com/juanfran", - "github.com/vmario89" + "github.com/eridur-de" ] } ] \ No newline at end of file