Update to v3.2.1

pull/196/head
Tom 2023-12-22 15:47:09 +01:00
parent daa734ee07
commit f0482cfafd
3 changed files with 24 additions and 10 deletions

View File

@ -107,6 +107,11 @@ https://github.com/BlafKing/sd-civitai-browser-plus/assets/9644716/44c5c7a0-4854
# Changelog 📋
<h3>v3.2.1</h3>
* Bug fix: Hotfix for functionality with SD.Next
---
<h3>v3.2.0</h3>
* Feature: A toggle for One-Time hash generation for externally downloaded models.

View File

@ -7,11 +7,13 @@ for item in aria2path.iterdir():
if item.is_file():
item.unlink()
if not launch.is_installed("send2trash"):
launch.run_pip("install send2trash", "requirements for CivitAI Browser")
if not launch.is_installed("zip_unicode"):
launch.run_pip("install ZipUnicode", "requirements for CivitAI Browser")
if not launch.is_installed("bs4"):
launch.run_pip("install beautifulsoup4", "requirements for CivitAI Browser")
if not launch.is_installed("fake_useragent"):
launch.run_pip("install fake_useragent", "requirements for CivitAI Browser")
def install_req(check_name, install_name=None):
if not install_name: install_name = check_name
if not launch.is_installed(f"{check_name}"):
launch.run_pip(f"install {install_name}", "requirements for CivitAI Browser")
install_req("send2trash")
install_req("zip_unicode", "ZipUnicode")
install_req("bs4", "beautifulsoup4")
install_req("fake_useragent")
install_req("packaging")

View File

@ -1,10 +1,11 @@
from click import launch
import gradio as gr
from modules import script_callbacks, shared, launch_utils
from modules import script_callbacks, shared
import os
import json
import fnmatch
import re
import subprocess
from modules.shared import opts, cmd_opts
from modules.paths import extensions_dir
import scripts.civitai_global as gl
@ -12,9 +13,15 @@ import scripts.civitai_download as _download
import scripts.civitai_file_manage as _file
import scripts.civitai_api as _api
def git_tag():
try:
return subprocess.check_output([os.environ.get('GIT', "git"), "describe", "--tags"], shell=False, encoding='utf8').strip()
except:
return "None"
try:
from packaging import version
ver = launch_utils.git_tag()
ver = git_tag()
ver_bool = version.parse(ver[1:]) >= version.parse("1.5")
except:
print(f"{gl.print} Python module 'packaging' has not been imported correctly, please try to restart or install it manually.")