From f6b45e7162ce3909cb2b04a4124e71aad22240c6 Mon Sep 17 00:00:00 2001 From: ByteHamster Date: Sat, 23 Mar 2024 11:27:55 +0100 Subject: Rename FeedMedia methods to no longer have underscores (#7017) --- .../src/main/java/de/danoeh/antennapod/parser/feed/FeedHandler.java | 2 +- .../main/java/de/danoeh/antennapod/parser/feed/util/TypeGetter.java | 6 +++--- .../antennapod/parser/feed/element/namespace/AtomParserTest.java | 4 ++-- .../parser/feed/element/namespace/FeedParserTestHelper.java | 2 +- .../antennapod/parser/feed/element/namespace/RssParserTest.java | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'parser/feed') diff --git a/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/FeedHandler.java b/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/FeedHandler.java index dd9cb836b..ee676be68 100644 --- a/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/FeedHandler.java +++ b/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/FeedHandler.java @@ -25,7 +25,7 @@ public class FeedHandler { SAXParserFactory factory = SAXParserFactory.newInstance(); factory.setNamespaceAware(true); SAXParser saxParser = factory.newSAXParser(); - File file = new File(feed.getFile_url()); + File file = new File(feed.getLocalFileUrl()); Reader inputStreamReader = new XmlStreamReader(file); InputSource inputSource = new InputSource(inputStreamReader); diff --git a/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/util/TypeGetter.java b/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/util/TypeGetter.java index 0f06b54c3..8f1173a28 100644 --- a/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/util/TypeGetter.java +++ b/parser/feed/src/main/java/de/danoeh/antennapod/parser/feed/util/TypeGetter.java @@ -29,7 +29,7 @@ public class TypeGetter { public Type getType(Feed feed) throws UnsupportedFeedtypeException { XmlPullParserFactory factory; - if (feed.getFile_url() != null) { + if (feed.getLocalFileUrl() != null) { Reader reader = null; try { factory = XmlPullParserFactory.newInstance(); @@ -86,7 +86,7 @@ public class TypeGetter { // XML document might actually be a HTML document -> try to parse as HTML String rootElement = null; try { - Jsoup.parse(new File(feed.getFile_url())); + Jsoup.parse(new File(feed.getLocalFileUrl())); rootElement = "html"; } catch (IOException e1) { e1.printStackTrace(); @@ -112,7 +112,7 @@ public class TypeGetter { private Reader createReader(Feed feed) { Reader reader; try { - reader = new XmlStreamReader(new File(feed.getFile_url())); + reader = new XmlStreamReader(new File(feed.getLocalFileUrl())); } catch (FileNotFoundException e) { e.printStackTrace(); return null; diff --git a/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/AtomParserTest.java b/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/AtomParserTest.java index ba8aaf4f0..148e2b270 100644 --- a/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/AtomParserTest.java +++ b/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/AtomParserTest.java @@ -47,9 +47,9 @@ public class AtomParserTest { assertTrue(item.hasMedia()); FeedMedia media = item.getMedia(); //noinspection ConstantConditions - assertEquals("http://example.com/media-" + i, media.getDownload_url()); + assertEquals("http://example.com/media-" + i, media.getDownloadUrl()); assertEquals(1024 * 1024, media.getSize()); - assertEquals("audio/mp3", media.getMime_type()); + assertEquals("audio/mp3", media.getMimeType()); // chapters assertNull(item.getChapters()); } diff --git a/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/FeedParserTestHelper.java b/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/FeedParserTestHelper.java index 5cc52d8cb..4497f455d 100644 --- a/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/FeedParserTestHelper.java +++ b/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/FeedParserTestHelper.java @@ -28,7 +28,7 @@ public abstract class FeedParserTestHelper { static Feed runFeedParser(@NonNull File feedFile) throws Exception { FeedHandler handler = new FeedHandler(); Feed parsedFeed = new Feed("http://example.com/feed", null); - parsedFeed.setFile_url(feedFile.getAbsolutePath()); + parsedFeed.setLocalFileUrl(feedFile.getAbsolutePath()); parsedFeed.setDownloaded(true); handler.parseFeed(parsedFeed); return parsedFeed; diff --git a/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/RssParserTest.java b/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/RssParserTest.java index 88ac5c731..bc30f2d7c 100644 --- a/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/RssParserTest.java +++ b/parser/feed/src/test/java/de/danoeh/antennapod/parser/feed/element/namespace/RssParserTest.java @@ -48,9 +48,9 @@ public class RssParserTest { assertTrue(item.hasMedia()); FeedMedia media = item.getMedia(); //noinspection ConstantConditions - assertEquals("http://example.com/media-" + i, media.getDownload_url()); + assertEquals("http://example.com/media-" + i, media.getDownloadUrl()); assertEquals(1024 * 1024, media.getSize()); - assertEquals("audio/mp3", media.getMime_type()); + assertEquals("audio/mp3", media.getMimeType()); // chapters assertNull(item.getChapters()); } @@ -81,7 +81,7 @@ public class RssParserTest { FeedItem feedItem = feed.getItems().get(0); //noinspection ConstantConditions assertEquals(MediaType.VIDEO, feedItem.getMedia().getMediaType()); - assertEquals("https://www.example.com/file.mp4", feedItem.getMedia().getDownload_url()); + assertEquals("https://www.example.com/file.mp4", feedItem.getMedia().getDownloadUrl()); } @Test -- cgit v1.2.3