Skip to content
Snippets Groups Projects
Commit 2587b7df authored by srosse's avatar srosse
Browse files

OO-4389: adapt the podcast / feed url to last versions of iOS / macOS

parent d00ca4ca
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 147 additions and 23 deletions
src/main/java/org/olat/admin/sysinfo/SchedulerController.java
+ 19
− 0
View file @ 2587b7df
/**
* <a href="http://www.openolat.org">
* OpenOLAT - Online Learning and Training</a><br>
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); <br>
* you may not use this file except in compliance with the License.<br>
* You may obtain a copy of the License at the
* <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
* <p>
* Unless required by applicable law or agreed to in writing,<br>
* software distributed under the License is distributed on an "AS IS" BASIS, <br>
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
* See the License for the specific language governing permissions and <br>
* limitations under the License.
* <p>
* Initial code contributed and copyrighted by<br>
* frentix GmbH, http://www.frentix.com
* <p>
*/
package org.olat.admin.sysinfo;
import java.util.ArrayList;
......
src/main/java/org/olat/modules/webFeed/FeedViewHelper.java
+ 6
− 13
View file @ 2587b7df
......@@ -132,17 +132,17 @@ public class FeedViewHelper {
/**
* @return The iTunes subscription url
*/
public String getITunesUrl(String protocol) {
public String getPodcastAppUrl() {
String iTunesfeed = null;
if (StringHelper.containsNonWhitespace(feedUrl)) {
try {
URL url = new URL(feedUrl);
if (!StringHelper.containsNonWhitespace(protocol)) {
protocol = "itpc";
iTunesfeed = "podcast://" + url.getHost() + url.getPath();
if (iTunesfeed.endsWith("/" + FeedManager.RSS_FEED_NAME)) {
iTunesfeed = iTunesfeed.replace("/" + FeedManager.RSS_FEED_NAME, "/feed.xml");
}
iTunesfeed = protocol + "://" + url.getHost() + url.getPath();
} catch (MalformedURLException e) {
log.warn("Malformed podcast URL: " + feedUrl, e);
log.warn("Malformed podcast URL: {}", feedUrl, e);
}
}
return iTunesfeed;
......@@ -598,13 +598,6 @@ public class FeedViewHelper {
* @return
*/
public boolean isAuthor(Item item) {
boolean isAuthor = false;
if (item != null && item.getAuthorKey() != null && item.getAuthorKey().equals(identity.getKey().longValue())) {
isAuthor = true;
}
return isAuthor;
return item != null && item.getAuthorKey() != null && item.getAuthorKey().equals(identity.getKey());
}
}
\ No newline at end of file
src/main/java/org/olat/modules/webFeed/dispatching/FeedMediaDispatcher.java
+ 4
− 4
View file @ 2587b7df
......@@ -25,6 +25,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.Logger;
import org.olat.basesecurity.Authentication;
import org.olat.basesecurity.BaseSecurity;
import org.olat.core.CoreSpringFactory;
......@@ -41,7 +42,6 @@ import org.olat.core.id.Identity;
import org.olat.core.id.IdentityEnvironment;
import org.olat.core.id.OLATResourceable;
import org.olat.core.id.Roles;
import org.apache.logging.log4j.Logger;
import org.olat.core.logging.Tracing;
import org.olat.core.util.StringHelper;
import org.olat.core.util.WebappHelper;
......@@ -207,14 +207,14 @@ public class FeedMediaDispatcher implements Dispatcher, GenericEventListener {
if(isAccessible(ureq, path, feed)) {
deliverFile(request, response, feed, path);
} else {
log.info("Access was denied. Path::" + path);
log.info("Access was denied. Path::{}", path);
DispatcherModule.sendForbidden(request.getRequestURI(), response);
}
} catch (InvalidPathException e) {
log.warn("The requested path is invalid. path::" + path, e);
log.warn("The requested path is invalid. path::{}", path, e);
DispatcherModule.sendBadRequest(request.getRequestURI(), response);
} catch (Exception e) {
log.warn("Nothing was delivered. Path::" + path, e);
log.warn("Nothing was delivered. Path::{}", path, e);
DispatcherModule.sendNotFound(request.getRequestURI(), response);
}
}
......
src/main/java/org/olat/modules/webFeed/dispatching/Path.java
+ 2
− 4
View file @ 2587b7df
......@@ -24,8 +24,6 @@ import java.util.List;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.olat.modules.webFeed.manager.FeedManager;
/**
* The Path class.
* <p>
......@@ -72,13 +70,13 @@ public class Path {
private static final String SLASH = "/";
private static final String BASE_PATH_DELIMITER = "/_/";
public static final String COURSE_NODE_INDICATOR = "coursenode";
public static final String MEDIA_DIR = "media";
public static final String MEDIA_DIR = "media";
private static final String AUTHENTICATION = NUMBER + SLASH + WORD + SLASH;
private static final String COURSE_PREFIX = COURSE_NODE_INDICATOR + SLASH;
private static final String COURSE_NODE = NUMBER + SLASH + WORD + SLASH;
private static final String FEED_ID = NUMBER + BASE_PATH_DELIMITER;
private static final String FEED_PATH = FEED_ID + FeedManager.RSS_FEED_NAME;
private static final String FEED_PATH = FEED_ID + "(feed.rss|feed.xml)";
private static final String FEED_MEDIA_PATH = FEED_ID + MEDIA_DIR + SLASH + FILE_NAME;
private static final String ITEM_MEDIA_PATH = FEED_ID + WORD + SLASH + MEDIA_DIR + SLASH + FILE_NAME;
......
src/main/java/org/olat/modules/webFeed/ui/podcast/_content/info.html
+ 2
− 2
View file @ 2587b7df
......@@ -27,11 +27,11 @@
<i class="o_icon o_icon-fw o_icon_rss"></i>
$r.translate("podcast.subscribe.rss")
</a>
<a href="$!helper.getITunesUrl("itpc")" class="btn btn-default " target="_blank" title="$r.translateInAttribute("podcast.subscribe.to.this.feed")">
<a href="$!helper.getPodcastAppUrl()" class="btn btn-default " target="_blank" title="$r.translateInAttribute("podcast.subscribe.to.this.feed")">
<i class="o_icon o_icon-fw o_icon_apple"></i>
$r.translate("podcast.subscribe.itunes")
</a>
<a href="$!helper.getITunesUrl("feed")" class="btn btn-default " target="_blank" title="$r.translateInAttribute("podcast.subscribe.to.this.feed")">
<a href="$!helper.getPodcastAppUrl()" class="btn btn-default " target="_blank" title="$r.translateInAttribute("podcast.subscribe.to.this.feed")">
<i class="o_icon o_icon-fw o_icon_mobile"></i>
$r.translate("podcast.subscribe.feed")
</a>
......
src/test/java/org/olat/ldap/manager/LDAPLoginManagerTest.java
+ 19
− 0
View file @ 2587b7df
/**
* <a href="http://www.openolat.org">
* OpenOLAT - Online Learning and Training</a><br>
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); <br>
* you may not use this file except in compliance with the License.<br>
* You may obtain a copy of the License at the
* <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
* <p>
* Unless required by applicable law or agreed to in writing,<br>
* software distributed under the License is distributed on an "AS IS" BASIS, <br>
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
* See the License for the specific language governing permissions and <br>
* limitations under the License.
* <p>
* Initial code contributed and copyrighted by<br>
* frentix GmbH, http://www.frentix.com
* <p>
*/
package org.olat.ldap.manager;
import java.util.ArrayList;
......
src/test/java/org/olat/modules/webFeed/dispatching/PathTest.java 0 → 100644
+ 94
− 0
View file @ 2587b7df
/**
* <a href="http://www.openolat.org">
* OpenOLAT - Online Learning and Training</a><br>
* <p>
* Licensed under the Apache License, Version 2.0 (the "License"); <br>
* you may not use this file except in compliance with the License.<br>
* You may obtain a copy of the License at the
* <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
* <p>
* Unless required by applicable law or agreed to in writing,<br>
* software distributed under the License is distributed on an "AS IS" BASIS, <br>
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
* See the License for the specific language governing permissions and <br>
* limitations under the License.
* <p>
* Initial code contributed and copyrighted by<br>
* frentix GmbH, http://www.frentix.com
* <p>
*/
package org.olat.modules.webFeed.dispatching;
import java.util.Arrays;
import java.util.Collection;
import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters;
/**
*
* Initial date: 3 déc. 2019<br>
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
@RunWith(Parameterized.class)
public class PathTest {
@Parameters
public static Collection<Object[]> data() {
return Arrays.asList(new Object[][] {
{ "720898/Wm3T3q/91225001686048/_/feed.rss", 11, 91225001686048l, "Wm3T3q", 720898l, null, null, null },
{ "720898/Wm3T3q/91225001686048/_/feed.xml", 11, 91225001686048l, "Wm3T3q", 720898l, null, null, null },
{ "720898/Wm3T3q/91225001686050/_/sropenpg_1_90970840170422/media/demo-video.mp4", 13, 91225001686050l, "Wm3T3q", 720898l, null, null, "demo-video.mp4" },
{ "coursenode/720898/Wm3T3q/91163349354954/90987128749136/91163349354956/_/feed.rss", 31, 91163349354956l, "Wm3T3q", 720898l, 91163349354954l, "90987128749136", null },
{ "coursenode/720898/Wm3T3q/91163349354954/90987128749136/91163349354956/_/feed.xml", 31, 91163349354956l, "Wm3T3q", 720898l, 91163349354954l, "90987128749136", null },
{ "coursenode/720898/Wm3T3q/91163349354954/90987128749136/91163349354956/_/sropenpg_1_90987128749491/media/shark.m4v", 33, 91163349354956l, "Wm3T3q", 720898l, 91163349354954l, "90987128749136", "shark.m4v" }
});
}
private String url;
private int type;
private String token;
private Long feedId;
private Long identityKey;
private Long courseId;
private String courseNodeId;
private String filename;
public PathTest(String url, int type, Long feedId, String token, Long identityKey, Long courseId, String courseNodeId, String filename) {
this.url = url;
this.type = type;
this.feedId = feedId;
this.token = token;
this.courseId = courseId;
this.courseNodeId = courseNodeId;
this.identityKey = identityKey;
this.filename = filename;
}
@Test
public void testPath() throws InvalidPathException {
Path path = new Path(url);
path.compile();
Assert.assertEquals(token, path.getToken());
Assert.assertEquals(feedId, path.getFeedId());
Assert.assertEquals(identityKey, path.getIdentityKey());
Assert.assertEquals(courseId, path.getCourseId());
Assert.assertEquals(courseNodeId, path.getNodeId());
Assert.assertEquals(filename, path.getItemFileName());
Assert.assertEquals(type, path.getType());
}
}
src/test/java/org/olat/test/AllTestsJunit4.java
+ 1
− 0
View file @ 2587b7df
......@@ -296,6 +296,7 @@ import org.junit.runners.Suite;
org.olat.modules.video.manager.VideoManagerTest.class,
org.olat.modules.video.spi.youtube.YoutubeProviderTest.class,
org.olat.modules.video.spi.youtube.YoutubeVideoIdTest.class,
org.olat.modules.webFeed.dispatching.PathTest.class,
org.olat.modules.webFeed.manager.FeedDAOTest.class,
org.olat.modules.webFeed.manager.ItemDAOTest.class,
org.olat.modules.webFeed.manager.FeedFileStorgeTest.class,
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment