Skip to content

Commit

Permalink
Fix iTunes dependencies required by lizzy.jar
Browse files Browse the repository at this point in the history
Refactored test code into unit tests.
Removed unused resource file "iTunesTest.xml"
  • Loading branch information
Borewit authored and Borewit committed Jan 30, 2023
1 parent 400f973 commit 641c635
Show file tree
Hide file tree
Showing 6 changed files with 176 additions and 625 deletions.
8 changes: 8 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,14 @@ dependencies {
// https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core
implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.1'

// Required by "src/jar/lizzy.jar"
// https://mvnrepository.com/artifact/commons-logging/commons-logging
runtimeOnly 'commons-logging:commons-logging:1.2'

// Required by "src/jar/lizzy.jar"
// https://mvnrepository.com/artifact/org.codehaus.castor/castor-xml
implementation 'org.codehaus.castor:castor-xml:1.4.1'

// JUnit Jupiter using Gradle's native JUnit Platform
testImplementation(platform('org.junit:junit-bom:5.9.2'))
testImplementation('org.junit.jupiter:junit-jupiter')
Expand Down
61 changes: 0 additions & 61 deletions src/main/java/listfix/testing/ITunesWriteTest.java

This file was deleted.

167 changes: 167 additions & 0 deletions src/test/java/listfix/playlists/itunes/ITunesPlaylistTests.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,167 @@
/*
* listFix() - Fix Broken Playlists!
* Copyright (C) 2001-2014 Jeremy Caron
*
* This file is part of listFix().
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, please see http://www.gnu.org/licenses/
*/

package listfix.playlists.itunes;
import static org.junit.jupiter.api.Assertions.*;

import christophedelory.playlist.SpecificPlaylist;
import christophedelory.playlist.SpecificPlaylistFactory;
import christophedelory.playlist.plist.PlistPlaylist;
import listfix.io.IPlayListOptions;
import listfix.model.playlists.Playlist;
import listfix.model.playlists.PlaylistEntry;
import listfix.model.playlists.itunes.ITunesMediaLibrary;
import listfix.model.playlists.itunes.ITunesPlaylist;
import listfix.model.playlists.itunes.ITunesPlaylistEntry;
import listfix.model.playlists.itunes.ITunesTrack;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.file.StandardCopyOption;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;

/**
* @author jcaron, Borewit
*/
public class ITunesPlaylistTests
{

public static final String iTunesLibraryXmlPath = "/itunes/iTunes Music Library.xml";

@Rule
public TemporaryFolder itunesFolder = new TemporaryFolder();
private File itunesMusicLibraryFile;

@Test
public void write_iTunes_music_library() throws Exception
{
File toOpen = create_iTunes_Music_Library();
// File toOpen = new File("C:\\Users\\jcaron\\Desktop\\svnListfix\\testing\\iTunesTest.xml");
SpecificPlaylist playlist = SpecificPlaylistFactory.getInstance().readFrom(toOpen);
PlistPlaylist plistList = (PlistPlaylist) playlist;
try (FileOutputStream stream = new FileOutputStream(toOpen))
{
plistList.writeTo(stream, "UTF-8");
}
}

@Test
public void openPlaylist() throws Exception
{
final File toOpen = create_iTunes_Music_Library();

SpecificPlaylist playlist = SpecificPlaylistFactory.getInstance().readFrom(toOpen);
PlistPlaylist plistList = (PlistPlaylist) playlist;
try (FileOutputStream stream = new FileOutputStream(toOpen))
{
plistList.writeTo(stream, "UTF-8");
}
ITunesMediaLibrary list = new ITunesMediaLibrary(plistList);
Playlist myList = convertToListFixPlaylist(list, toOpen, new IPlayListOptions()
{
@Override
public boolean getAlwaysUseUNCPaths()
{
return false;
}

@Override
public boolean getSavePlaylistsWithRelativePaths()
{
return false;
}

@Override
public String getIgnoredSmallWords()
{
return "";
}

@Override
public int getMaxClosestResults()
{
return 0;
}

@Override
public boolean getCaseInsensitiveExactMatching()
{
return true;
}
});
myList.getEntries();
}

private static Playlist convertToListFixPlaylist(ITunesMediaLibrary list, File listFile, IPlayListOptions playListOptions)
{
List<PlaylistEntry> newList = new ArrayList<>();
Map<String, ITunesTrack> tracks = list.getTracks();

for (String id : tracks.keySet())
{
ITunesTrack track = tracks.get(id);
try
{
newList.add(new ITunesPlaylistEntry(playListOptions, new File((new URI(track.getLocation())).getPath()), track.getArtist() + " - " + track.getName(), track.getDuration(), listFile, track));
}
catch (URISyntaxException ex)
{
Logger.getLogger(PlaylistOpener.class.getName()).log(Level.SEVERE, null, ex);
}
}
try
{
return new ITunesPlaylist(listFile, newList, list, playListOptions);
}
catch (Exception ex)
{
Logger.getLogger(PlaylistOpener.class.getName()).log(Level.SEVERE, null, ex);
}
return null;
}

private synchronized File create_iTunes_Music_Library() throws IOException
{
if (this.itunesMusicLibraryFile == null)
{
this.itunesMusicLibraryFile = this.itunesFolder.newFile("iTunes Music Library.xml");
try (InputStream inputStream = this.getClass().getResourceAsStream(iTunesLibraryXmlPath))
{
assertNotNull(inputStream, "Load test resource: \"" + iTunesLibraryXmlPath + "\"");
java.nio.file.Files.copy(
inputStream,
this.itunesMusicLibraryFile.toPath(),
StandardCopyOption.REPLACE_EXISTING);
}
}
return this.itunesMusicLibraryFile;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* along with this program; if not, please see http://www.gnu.org/licenses/
*/

package listfix.testing;
package listfix.playlists.itunes;

import christophedelory.playlist.SpecificPlaylist;
import christophedelory.playlist.SpecificPlaylistFactory;
Expand Down
File renamed without changes.
Loading

0 comments on commit 641c635

Please sign in to comment.