From c8b67d31977f17859f0f619920efab2c2dc2f126 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Sat, 30 Dec 2023 10:51:37 -0500 Subject: [PATCH] add non-git mode --- CHANGELOG.md | 2 ++ installer.py | 5 ++--- modules/extensions.py | 5 ++++- wiki | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7af86b13a..6a243073e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,8 @@ ## Update for 2023-12-30 - **Improvements**: + - allow deployment without git clone + for example, zip of the sdnext folder can be used - control: configurable output folder in settings - cli: sdapi.py allow manual api invoke example: `python cli/sdapi.py /sdapi/v1/sd-models` diff --git a/installer.py b/installer.py index 5972f66c0..d74b65568 100644 --- a/installer.py +++ b/installer.py @@ -815,9 +815,8 @@ def check_version(offline=False, reset=True): # pylint: disable=unused-argument if args.skip_all: return if not os.path.exists('.git'): - log.error('Not a git repository') - if not args.ignore: - sys.exit(1) + log.warning('Not a git repository, all git operations are disabled') + args.skip_git = True # pylint: disable=attribute-defined-outside-init log.info(f'Version: {print_dict(get_version())}') if args.version or args.skip_git: return diff --git a/modules/extensions.py b/modules/extensions.py index 3ad20acec..b043e2ff8 100644 --- a/modules/extensions.py +++ b/modules/extensions.py @@ -57,6 +57,9 @@ class Extension: else: try: self.status = 'unknown' + if len(repo.remotes) == 0: + shared.log.debug(f"Extension: no remotes info repo={self.name}") + return self.git_name = repo.remotes.origin.url.split('.git')[0].split('/')[-1] self.description = repo.description if self.description is None or self.description.startswith("Unnamed repository"): @@ -72,7 +75,7 @@ class Extension: self.commit_hash = head.hexsha self.version = f"

{self.commit_hash[:8]}

{datetime.fromtimestamp(self.commit_date).strftime('%a %b%d %Y %H:%M')}

" except Exception as ex: - shared.log.error(f"Failed reading extension data from Git repository: {self.name}: {ex}") + shared.log.error(f"Extension: failed reading data from git repo={self.name}: {ex}") self.remote = None def list_files(self, subdir, extension): diff --git a/wiki b/wiki index 6ba553609..2ad85c585 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit 6ba5536099537d54d5767447f27e0c5ec0d89705 +Subproject commit 2ad85c585235e655d2565c9ba632f345214f8e7d