Fix labels not being read when using cc (#767)

Author: Josef-Haupt

birdnet_analyzer/analyze/core.py

@@ -219,10 +219,10 @@ def _set_params(
         if custom_classifier.endswith(".tflite"):
             cfg.LABELS_FILE = custom_classifier.replace(".tflite", "_Labels.txt")  # same for labels file
 
-            if not os.path.isfile(cfg.LABELS_FILE):
+            if not os.path.isfile(cfg.LABELS_FILE): # if the label file is not found, an old birdnet model might be used
                 cfg.LABELS_FILE = custom_classifier.replace("Model_FP32.tflite", "Labels.txt")
 
-            if not custom_classifier.endswith("Model_FP32.tflite") or not os.path.isfile(cfg.LABELS_FILE):
+            if not os.path.isfile(cfg.LABELS_FILE): # if the label file is still not found, dont use labels
                 cfg.LABELS_FILE = None
                 cfg.LABELS = None
             else:

birdnet_analyzer/gui/utils.py

@@ -605,10 +605,10 @@ def on_custom_classifier_selection_click():
                 if not os.path.isfile(labels):
                     labels = file.replace("Model_FP32.tflite", "Labels.txt")
 
-                    if not file.endswith("Model_FP32.tflite") or not os.path.isfile(labels):
-                        gr.Warning(loc.localize("species-list-custom-classifier-no-labelfile-warning"))
+                if not os.path.isfile(labels):
+                    gr.Warning(loc.localize("species-list-custom-classifier-no-labelfile-warning"))
 
-                        return file, gr.File(value=[file], visible=True)
+                    return file, gr.File(value=[file], visible=True)
 
                 return file, gr.File(value=[file, labels], visible=True)