blender
/
blender-addons
17
34
Fork 94
Code Issues 528 Pull Requests 32 Projects 1 Releases Wiki Activity

Skip cleanup if there's only one single file #104582

Merged
Brecht Van Lommel merged 2 commits from Walles/blender-addons:johan/single-file into main 2023-06-27 10:14:13 +02:00
Conversation 0 Commits 2 Files Changed 2 +33 -1
Johan Walles commented 2023-04-30 15:05:02 +02:00
Contributor
Copy Link

Fixes #104573

Before this change we tried to cleanup a list consisting of a single file only. Then, since that single file had the same prefix as itself, we removed it from the list.

With this change in place, we skip cleanup if there's only one single file.

Tested using file name banana-color.webp.

Fixes https://projects.blender.org/blender/blender-addons/issues/104573 Before this change we tried to cleanup a list consisting of a single file only. Then, since that single file had the same prefix as itself, we removed it from the list. With this change in place, we skip cleanup if there's only one single file. Tested using file name `banana-color.webp`.
Johan Walles force-pushed johan/single-file from 81b43c1d8d to d5d3477f8c 2023-06-26 06:42:41 +02:00 Compare
Johan Walles requested review from Brecht Van Lommel 2023-06-26 06:43:31 +02:00
Brecht Van Lommel requested changes 2023-06-26 11:02:08 +02:00
node_wrangler/utils/paths.py Outdated
@ -104,3 +104,3 @@
all_tags.update(socket_tags)
while True:
while names_to_tag_lists and len(names_to_tag_lists) > 1:
Brecht Van Lommel commented 2023-06-26 11:02:00 +02:00
Owner
Copy Link

I think this is testing for the same thing twice? This can't be None, and empty dictionaries return false.

I think this is testing for the same thing twice? This can't be None, and empty dictionaries return false.
Johan Walles commented 2023-06-26 19:44:10 +02:00
Author
Contributor
Copy Link

Let's see.

The first part before and is true if the list is at least 1 long.

The second part after and is true if the list is at least 2 long.

And as you say, since the list is initialized to empty higher up and thus can't be None I believe you are right!

I'll fix this.

Let's see. The first part before `and` is true if the list is at least 1 long. The second part after `and` is true if the list is at least 2 long. And as you say, since the list is initialized to empty higher up and thus can't be `None` I believe you are right! I'll fix this.
Walles marked this conversation as resolved
Johan Walles force-pushed johan/single-file from 137033a590 to daee55f8fc 2023-06-26 19:48:28 +02:00 Compare
Brecht Van Lommel approved these changes 2023-06-27 10:11:50 +02:00
Brecht Van Lommel merged commit cbf4156ebc into main 2023-06-27 10:14:13 +02:00
Brecht Van Lommel deleted branch johan/single-file 2023-06-27 10:14:14 +02:00
Sign in to join this conversation.
Reviewers
No reviewers
Brecht Van Lommel
Labels
Clear labels   
Interest
Animation & Rigging

  
Interest
Blender Cloud

  
Interest
Collada

  
Interest
Core

  
Interest
Documentation

  
Interest
Eevee & Viewport

  
Interest
Geometry Nodes

  
Interest
Grease Pencil

  
Interest
Import and Export

  
Interest
Modeling

  
Interest
Modifiers

  
Interest
Nodes & Physics

  
Interest
Pipeline, Assets & IO

  
Interest
Platforms, Builds, Tests & Devices

  
Interest
Python API

  
Interest
Rendering & Cycles

  
Interest
Sculpt, Paint & Texture

  
Interest
Translations

  
Interest
User Interface

  
Interest
UV Editing

  
Interest
VFX & Video

  
Meta
Good First Issue

  
Meta
Papercut

  
Module
Add-ons (BF-Blender)

  
Module
Add-ons (Community)

  
Platform
Linux

  
Platform
macOS

  
Platform
Windows

  
Priority
High

  
Priority
Low

  
Priority
Normal

  
Priority
Unbreak Now!

  
Status
Archived

  
Status
Confirmed

  
Status
Duplicate

  
Status
Needs Info from Developers

  
Status
Needs Information from User

  
Status
Needs Triage

  
Status
Resolved

  
Type
Bug

  
Type
Design

  
Type
Known Issue

  
Type
Patch

  
Type
Report

  
Type
To Do

No Label
Interest
Animation & Rigging
Interest
Blender Cloud
Interest
Collada
Interest
Core
Interest
Documentation
Interest
Eevee & Viewport
Interest
Geometry Nodes
Interest
Grease Pencil
Interest
Import and Export
Interest
Modeling
Interest
Modifiers
Interest
Nodes & Physics
Interest
Pipeline, Assets & IO
Interest
Platforms, Builds, Tests & Devices
Interest
Python API
Interest
Rendering & Cycles
Interest
Sculpt, Paint & Texture
Interest
Translations
Interest
User Interface
Interest
UV Editing
Interest
VFX & Video
Meta
Good First Issue
Meta
Papercut
Module
Add-ons (BF-Blender)
Module
Add-ons (Community)
Platform
Linux
Platform
macOS
Platform
Windows
Priority
High
Priority
Low
Priority
Normal
Priority
Unbreak Now!
Status
Archived
Status
Confirmed
Status
Duplicate
Status
Needs Info from Developers
Status
Needs Information from User
Status
Needs Triage
Status
Resolved
Type
Bug
Type
Design
Type
Known Issue
Type
Patch
Type
Report
Type
To Do
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: blender/blender-addons#104582
No description provided.
Delete Branch "Walles/blender-addons:johan/single-file"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?