Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
}

group = 'com.josdem.jmetadata'
version = '1.3.4'
version = '1.3.5'

java {
toolchain {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,12 @@
import java.util.List;
import javax.annotation.PostConstruct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.asmatron.messengine.annotations.RequestMethod;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import retrofit2.Response;

@Slf4j
@Controller
@RequiredArgsConstructor
public class CompleteController {
Expand All @@ -57,8 +57,6 @@ public class CompleteController {
private RestService restService;
private CoverArtRestService coverArtRestService;

private final Logger log = LoggerFactory.getLogger(this.getClass());

@PostConstruct
void setup() {
restService = RetrofitHelper.getRetrofit().create(RestService.class);
Expand All @@ -85,6 +83,9 @@ public synchronized ActionResult completeAlbumMetadata(List<Metadata> metadataLi
String albumName = metadataList.getFirst().getAlbum();
ApplicationState.cache.put(albumName, musicBrainzResponse);
log.info("MusicBrainz Response: {}", musicBrainzResponse);
if (musicBrainzResponse.getReleases().isEmpty()) {
return ActionResult.Ready;
}
Album album = musicBrainzService.getAlbumByName(albumName);
log.info("MusicBrainz Album: {}", album);
musicBrainzService.completeYear(metadataList, album);
Expand Down Expand Up @@ -116,7 +117,7 @@ public ActionResult completeLastFmMetadata(List<Metadata> metadataList) {
if (!lastFMCompleteServiceAdapter.canComplete(metadataList)) {
return ActionResult.Ready;
}
metadataList.forEach(metadata -> lastfmService.completeLastFM(metadata));
metadataList.forEach(lastfmService::completeLastFM);
return ActionResult.New;
}

Expand Down
7 changes: 3 additions & 4 deletions src/main/java/com/josdem/jmetadata/gui/MainWindow.java
Original file line number Diff line number Diff line change
Expand Up @@ -949,10 +949,9 @@ protected Boolean doInBackground() throws Exception {
public void onResponse(ActionResult response) {
updateStatus(counter++, metadataList.size());
log.info(
"response in getting from MusicBrainz album "
+ metadata.getTitle()
+ ": "
+ response);
"response in getting information from MusicBrainz track{}: {}",
metadata.getTitle(),
response);
if (response.equals(ActionResult.New)) {
metadataWithAlbum.add(metadata);
getDescriptionTable()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ public class LastFMCompleteServiceAdapter implements CompleteService {

@Override
public boolean canComplete(List<Metadata> metadataList) {
return (!metadataService.isSameAlbum(metadataList)
|| !metadataService.isSameArtist(metadataList));
return metadataService.isSameAlbum(metadataList) || metadataService.isSameArtist(metadataList);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ public class MusicBrainzCompleteServiceAdapter implements CompleteService {

@Override
public boolean canComplete(List<Metadata> metadataList) {
return (!metadataService.isSameAlbum(metadataList)
|| !metadataService.isSameArtist(metadataList));
return metadataService.isSameAlbum(metadataList) || metadataService.isSameArtist(metadataList);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
Copyright 2025 Jose Morales [email protected]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package com.josdem.jmetadata.service;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;

import com.josdem.jmetadata.model.Metadata;
import com.josdem.jmetadata.service.impl.LastFMCompleteServiceAdapter;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;

@Slf4j
class LastFmCompleteServiceAdapterTest {

private LastFMCompleteServiceAdapter lastFMCompleteServiceAdapter;

@Mock private LastFMCompleteService lastFMCompleteService;
@Mock private MetadataService metadataService;

private final Metadata metadata = new Metadata();

@BeforeEach
void setup() {
MockitoAnnotations.openMocks(this);
lastFMCompleteServiceAdapter =
new LastFMCompleteServiceAdapter(lastFMCompleteService, metadataService);
}

@Test
@DisplayName("detecting I can complete metadata due to same album")
void shouldDetectIfCanCompleteMetadataDueToSameAlbum(TestInfo testInfo) {
log.info(testInfo.getDisplayName());
when(metadataService.isSameAlbum(List.of(metadata))).thenReturn(true);
assertTrue(lastFMCompleteServiceAdapter.canComplete(List.of(metadata)));
}

@Test
@DisplayName("detecting I can complete metadata due to same artist")
void shouldDetectIfCanCompleteMetadataDueToSameArtist(TestInfo testInfo) {
log.info(testInfo.getDisplayName());
when(metadataService.isSameArtist(List.of(metadata))).thenReturn(true);
assertTrue(lastFMCompleteServiceAdapter.canComplete(List.of(metadata)));
}

@Test
@DisplayName("detecting I cannot complete metadata")
void shouldDetectIfCannotCompleteMetadata(TestInfo testInfo) {
log.info(testInfo.getDisplayName());
when(metadataService.isSameAlbum(List.of(metadata))).thenReturn(false);
when(metadataService.isSameArtist(List.of(metadata))).thenReturn(false);
assertFalse(lastFMCompleteServiceAdapter.canComplete(List.of(metadata)));
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
Copyright 2025 Jose Morales [email protected]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package com.josdem.jmetadata.service;

import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.Mockito.when;

import com.josdem.jmetadata.model.Metadata;
import com.josdem.jmetadata.service.impl.MusicBrainzCompleteServiceAdapter;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInfo;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;

@Slf4j
class MusicBrainzCompleteServiceAdapterTest {

private MusicBrainzCompleteServiceAdapter musicBrainzCompleteServiceAdapter;

@Mock private MusicBrainzService musicBrainzService;
@Mock private MetadataService metadataService;

private final Metadata metadata = new Metadata();

@BeforeEach
void setup() {
MockitoAnnotations.openMocks(this);
musicBrainzCompleteServiceAdapter =
new MusicBrainzCompleteServiceAdapter(musicBrainzService, metadataService);
}

@Test
@DisplayName("detecting I can complete metadata due to same album")
void shouldDetectIfCanCompleteMetadataDueToSameAlbum(TestInfo testInfo) {
log.info(testInfo.getDisplayName());
when(metadataService.isSameAlbum(List.of(metadata))).thenReturn(true);
assertTrue(musicBrainzCompleteServiceAdapter.canComplete(List.of(metadata)));
}

@Test
@DisplayName("detecting I can complete metadata due to same artist")
void shouldDetectIfCanCompleteMetadataDueToSameArtist(TestInfo testInfo) {
log.info(testInfo.getDisplayName());
when(metadataService.isSameArtist(List.of(metadata))).thenReturn(true);
assertTrue(musicBrainzCompleteServiceAdapter.canComplete(List.of(metadata)));
}

@Test
@DisplayName("detecting I cannot complete metadata")
void shouldDetectIfCannotCompleteMetadata(TestInfo testInfo) {
log.info(testInfo.getDisplayName());
when(metadataService.isSameAlbum(List.of(metadata))).thenReturn(false);
when(metadataService.isSameArtist(List.of(metadata))).thenReturn(false);
assertFalse(musicBrainzCompleteServiceAdapter.canComplete(List.of(metadata)));
}
}