Skip to content

Commit 64c62a7

Browse files
opticodopticod
authored
Merge pull request #301 from iit2014086/bug-fixes
added metacafe video support for videocollectiontemplate
2 parents 140ddce + 62a3d4f commit 64c62a7

4 files changed

Lines changed: 36 additions & 6 deletions

File tree

‎source-code/app/src/main/assets/VideoCollectionApp.apk‎

640 Bytes
Binary file not shown.

‎source-code/app/src/main/java/org/buildmlearn/toolkit/templates/VideoCollectionTemplate.java‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ public class VideoCollectionTemplate implements TemplateInterface {
5050
private static final String YOUTUBE_SHORT = "youtu.be";
5151
private static final String DAILYMOTION = "dailymotion";
5252
private static final String VIMEO = "vimeo";
53+
private static final String METACAFE = "metacafe";
5354
transient private VideoCollectionAdapter adapter;
5455
private ArrayList<VideoModel> videoData;
5556
transient private ProgressDialog progress;
@@ -71,7 +72,7 @@ private static boolean validated(Context context, EditText link) {
7172
if ("".equals(linkText)) {
7273
link.setError(context.getString(R.string.video_collection_template_link_hint));
7374
return false;
74-
} else if (!(linkText.contains(YOUTUBE + ".com") || linkText.contains(YOUTUBE_SHORT) || linkText.contains(DAILYMOTION + ".com") || linkText.contains(VIMEO + ".com"))) {
75+
} else if (!(linkText.contains(YOUTUBE + ".com") || linkText.contains(YOUTUBE_SHORT) || linkText.contains(DAILYMOTION + ".com") || linkText.contains(METACAFE + ".com") || linkText.contains(VIMEO + ".com"))) {
7576
link.setError(context.getString(R.string.video_collection_template_linited_links));
7677
return false;
7778
}
@@ -99,7 +100,8 @@ private static boolean validated(Context context, EditText title, EditText descr
99100
return false;
100101
} else if(!Patterns.WEB_URL.matcher(linkText).matches()){
101102
link.setError(context.getString(R.string.video_collection_template_link_valid_hint));
102-
} else if (!(linkText.contains(YOUTUBE + ".com") || linkText.contains(YOUTUBE_SHORT) || linkText.contains(DAILYMOTION + ".com") || linkText.contains(VIMEO + ".com"))) {
103+
return false;
104+
} else if (!(linkText.contains(YOUTUBE + ".com") || linkText.contains(YOUTUBE_SHORT) || linkText.contains(DAILYMOTION + ".com") || linkText.contains(METACAFE + ".com") || linkText.contains(VIMEO + ".com"))) {
103105
link.setError(context.getString(R.string.video_collection_template_linited_links));
104106
return false;
105107
}
@@ -191,6 +193,18 @@ private String convertLink(String link) {
191193

192194
String VIMEO_OEMBED_LINK = "https://vimeo.com/api/oembed.json?url=";
193195
return VIMEO_OEMBED_LINK + link;
196+
} else if (link.contains(METACAFE)) {
197+
if (!link.contains("www.")) {
198+
link = "http://www." + link;
199+
} else if (!(link.contains("http:") || link.contains("https:"))) {
200+
link = "http://" + link;
201+
}
202+
if(!link.endsWith("/")) {
203+
link = link+"/";
204+
}
205+
link.replaceFirst("https://","http://");
206+
207+
return link;
194208
}
195209

196210
return null;
@@ -411,7 +425,7 @@ protected String doInBackground(String... params) {
411425
success = true;
412426
final String BASE_URL = params[0];
413427

414-
if (BASE_URL.contains(YOUTUBE + ".com")) {
428+
if (BASE_URL.contains(YOUTUBE + ".com") || BASE_URL.contains(METACAFE + ".com")) {
415429
try {
416430
int TIMEOUT_LIMIT = 60000;
417431
String USER_AGENT = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.94 Safari/537.36";
@@ -426,8 +440,15 @@ protected String doInBackground(String... params) {
426440
String META_CONTENT = "content";
427441
String title = titleElem.attr(META_CONTENT);
428442

429-
org.jsoup.nodes.Element inputElements = document.getElementById("watch-description-text");
430-
String description = inputElements.html();
443+
String description = "";
444+
if(BASE_URL.contains(YOUTUBE + ".com")) {
445+
org.jsoup.nodes.Element inputElements = document.getElementById("watch-description-text");
446+
description = inputElements.html();
447+
} else if(BASE_URL.contains(METACAFE + ".com")) {
448+
String META_PROPERTY_DESCRIPTION = "meta[name=description]";
449+
Elements descriptionElem = document.select(META_PROPERTY_DESCRIPTION);
450+
description = descriptionElem.attr(META_CONTENT);
451+
}
431452

432453
//String META_PROPERTY_DESCRIPTION = "meta[property=og:description]";
433454
//Elements descriptionElem = document.select(META_PROPERTY_DESCRIPTION);

‎source-code/app/src/main/java/org/buildmlearn/toolkit/videocollectiontemplate/fragment/DetailActivityFragment.java‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,15 @@ public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
188188
"</body></html>";
189189

190190
player.loadData(playVideo, "text/html", "utf-8");
191+
} else if(link.contains("metacafe.com")) {
192+
193+
String embedlink = link.replaceFirst("metacafe.com/watch","metacafe.com/embed");
194+
String playVideo = "<html><body style=\"margin: 0; padding: 0\">" +
195+
" <iframe class=\"player\" type=\"text/html\" width=\"100%\" height=\"850\" src=\"" + embedlink + "\">" +
196+
"</body></html>";
197+
198+
player.loadData(playVideo, "text/html", "utf-8");
199+
191200
}
192201

193202
rootView.findViewById(R.id.next).setOnClickListener(new View.OnClickListener() {

‎source-code/app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@
359359
<string name="comprehension_edit_meta_title">Edit Meta Details</string>
360360
<string name="meta_add_help">Click Add button to start adding meta details</string>
361361
<string name="restart_comprehension">RESTART</string>
362-
<string name="video_collection_template_linited_links">Only Youtube, Dailymotion and Vimeo links supported.</string>
362+
<string name="video_collection_template_linited_links">Only Youtube, Dailymotion, Metacafe and Vimeo links supported.</string>
363363

364364
<string name="restore_msg">Restoring data from Apk</string>
365365
<string name="expandbutton">expandButton</string>

0 commit comments

Comments
 (0)