From bc0d80759c3dda12c78ac2cdc4047e09d07f6744 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Mon, 15 Feb 2016 15:42:30 +0100 Subject: Load embedded chapters from local files --- .../main/java/de/danoeh/antennapod/core/feed/FeedMedia.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java index f1ecaf04..6b11e162 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java +++ b/core/src/main/java/de/danoeh/antennapod/core/feed/FeedMedia.java @@ -386,11 +386,14 @@ public class FeedMedia extends FeedFile implements Playable { // check if chapters are stored in db and not loaded yet. if (item != null && item.hasChapters() && item.getChapters() == null) { DBReader.loadChaptersOfFeedItem(item); - } else if (item != null && item.getChapters() == null && !localFileAvailable()) { - ChapterUtils.loadChaptersFromStreamUrl(this); + } else if (item != null && item.getChapters() == null) { + if(localFileAvailable()) { + ChapterUtils.loadChaptersFromFileUrl(this); + } else { + ChapterUtils.loadChaptersFromStreamUrl(this); + } if (getChapters() != null && item != null) { - DBWriter.setFeedItem( - item); + DBWriter.setFeedItem(item); } } } -- cgit v1.2.3 From d6498ae50d7c6323bc45b346ed9fd96c59db51c6 Mon Sep 17 00:00:00 2001 From: Martin Fietz Date: Mon, 15 Feb 2016 16:01:21 +0100 Subject: After downloading, check downloaded episode for chapters --- .../de/danoeh/antennapod/core/service/download/DownloadService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java index 72fa1e1f..65ff8974 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java +++ b/core/src/main/java/de/danoeh/antennapod/core/service/download/DownloadService.java @@ -72,6 +72,7 @@ import de.danoeh.antennapod.core.storage.DownloadRequester; import de.danoeh.antennapod.core.syndication.handler.FeedHandler; import de.danoeh.antennapod.core.syndication.handler.FeedHandlerResult; import de.danoeh.antennapod.core.syndication.handler.UnsupportedFeedtypeException; +import de.danoeh.antennapod.core.util.ChapterUtils; import de.danoeh.antennapod.core.util.DownloadError; import de.danoeh.antennapod.core.util.InvalidFeedException; import de.greenrobot.event.EventBus; @@ -1046,6 +1047,9 @@ public class DownloadService extends Service { media.setFile_url(request.getDestination()); media.setHasEmbeddedPicture(null); + // check if file has chapters + ChapterUtils.loadChaptersFromFileUrl(media); + // Get duration MediaMetadataRetriever mmr = null; try { -- cgit v1.2.3