Refactor recipe metadata handling and update CSS styles

- Moved the recipe metadata appending logic to occur after the JSON creation for better workflow.
- Adjusted the user comment formatting in ExifUtils to include a newline for improved readability.
- Reduced the maximum height of the recipe modal bottom section for better layout consistency.
This commit is contained in:
Will Miao
2025-03-20 19:53:05 +08:00
parent 6a10cda61f
commit 5cfae7198d
4 changed files with 7 additions and 7 deletions

View File

@@ -423,9 +423,6 @@ class RecipeRoutes:
with open(image_path, 'wb') as f: with open(image_path, 'wb') as f:
f.write(optimized_image) f.write(optimized_image)
# Add recipe metadata to the image
ExifUtils.append_recipe_metadata(image_path, recipe_data)
# Create the recipe JSON # Create the recipe JSON
current_time = time.time() current_time = time.time()
@@ -486,6 +483,9 @@ class RecipeRoutes:
json_path = os.path.join(recipes_dir, json_filename) json_path = os.path.join(recipes_dir, json_filename)
with open(json_path, 'w', encoding='utf-8') as f: with open(json_path, 'w', encoding='utf-8') as f:
json.dump(recipe_data, f, indent=4, ensure_ascii=False) json.dump(recipe_data, f, indent=4, ensure_ascii=False)
# Add recipe metadata to the image
ExifUtils.append_recipe_metadata(image_path, recipe_data)
# Simplified cache update approach # Simplified cache update approach
# Instead of trying to update the cache directly, just set it to None # Instead of trying to update the cache directly, just set it to None

View File

@@ -135,7 +135,7 @@ class ExifUtils:
recipe_metadata_marker = f"Recipe metadata: {recipe_metadata_json}" recipe_metadata_marker = f"Recipe metadata: {recipe_metadata_json}"
# Append to existing user comment or create new one # Append to existing user comment or create new one
new_user_comment = f"{user_comment}, {recipe_metadata_marker}" if user_comment else recipe_metadata_marker new_user_comment = f"{user_comment} \n {recipe_metadata_marker}" if user_comment else recipe_metadata_marker
# Write back to the image # Write back to the image
return ExifUtils.update_user_comment(image_path, new_user_comment) return ExifUtils.update_user_comment(image_path, new_user_comment)

View File

@@ -220,7 +220,7 @@
/* Bottom Section: Resources */ /* Bottom Section: Resources */
.recipe-bottom-section { .recipe-bottom-section {
max-height: 340px; max-height: 320px;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
border-top: 1px solid var(--border-color); border-top: 1px solid var(--border-color);

View File

@@ -354,9 +354,9 @@ export class ImportManager {
this.updateTagsDisplay(); this.updateTagsDisplay();
} }
} else if (this.recipeData && this.recipeData.gen_params && this.recipeData.gen_params.prompt) { } else if (this.recipeData && this.recipeData.gen_params && this.recipeData.gen_params.prompt) {
// Use the first 15 words from the prompt as the default recipe name // Use the first 10 words from the prompt as the default recipe name
const promptWords = this.recipeData.gen_params.prompt.split(' '); const promptWords = this.recipeData.gen_params.prompt.split(' ');
const truncatedPrompt = promptWords.slice(0, 15).join(' '); const truncatedPrompt = promptWords.slice(0, 10).join(' ');
recipeName.value = truncatedPrompt; recipeName.value = truncatedPrompt;
this.recipeName = truncatedPrompt; this.recipeName = truncatedPrompt;