fix for none
This commit is contained in:
@@ -178,17 +178,19 @@ ai_dest() {
|
|||||||
python3 -c "
|
python3 -c "
|
||||||
import json, sys
|
import json, sys
|
||||||
m = json.load(open('$AI_META'))
|
m = json.load(open('$AI_META'))
|
||||||
entry = m.get(sys.argv[1], {})
|
entry = m.get(sys.argv[1])
|
||||||
if not entry:
|
if not entry or not isinstance(entry, dict):
|
||||||
print('AI/unknown')
|
print('AI/unknown')
|
||||||
sys.exit(0)
|
sys.exit(0)
|
||||||
def clean(s):
|
def clean(s):
|
||||||
|
if not s:
|
||||||
|
return 'unknown'
|
||||||
return s.replace('/', '-').replace('\\\\', '-')
|
return s.replace('/', '-').replace('\\\\', '-')
|
||||||
|
|
||||||
model = clean(entry.get('model', 'unknown'))
|
model = clean(entry.get('model'))
|
||||||
loras = entry.get('loras', [])
|
loras = entry.get('loras') or []
|
||||||
if loras:
|
if loras:
|
||||||
combo = '+'.join(clean(l.strip()) for l in loras)
|
combo = '+'.join(clean(l.strip()) for l in loras if l)
|
||||||
combo = (combo[:200]).rstrip('+')
|
combo = (combo[:200]).rstrip('+')
|
||||||
print(f'AI/{model}/{combo}')
|
print(f'AI/{model}/{combo}')
|
||||||
else:
|
else:
|
||||||
@@ -203,8 +205,12 @@ for f in "${FILES[@]}"; do
|
|||||||
cat=$(classify "$f")
|
cat=$(classify "$f")
|
||||||
|
|
||||||
if [ "$cat" = "AI" ] && [ "$FLAT" = false ] && [ -n "$AI_META" ]; then
|
if [ "$cat" = "AI" ] && [ "$FLAT" = false ] && [ -n "$AI_META" ]; then
|
||||||
sub=$(ai_dest "$(basename "$f")")
|
sub=$(ai_dest "$(basename "$f")" 2>/dev/null) || sub=""
|
||||||
|
if [ -z "$sub" ]; then
|
||||||
|
dest="$TARGET/AI/unknown/"
|
||||||
|
else
|
||||||
dest="$TARGET/$sub"
|
dest="$TARGET/$sub"
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
dest="$TARGET/$cat/"
|
dest="$TARGET/$cat/"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user