garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

use title if text is empty (fix #419)

Browse Source
This commit is contained in:
Athou
2013-07-11 13:35:58 +02:00
parent 0eef8d70ad
commit e02532aa7b
1 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/commafeed/backend/feeds/OPMLImporter.java
View File

@@ -59,14 +59,19 @@ public class OPMLImporter {
private void handleOutline(User user, Outline outline, FeedCategory parent) {
if (StringUtils.isEmpty(outline.getType())) {
FeedCategory category = feedCategoryDAO.findByName(user,
outline.getText(), parent);
String name = FeedUtils.truncate(outline.getText(), 128);
if (name == null) {
name = FeedUtils.truncate(outline.getTitle(), 128);
}
FeedCategory category = feedCategoryDAO.findByName(user, name,
parent);
if (category == null) {
category = new FeedCategory();
category.setName(FeedUtils.truncate(outline.getText(), 128));
if (StringUtils.isBlank(category.getName())) {
category.setName("Unnamed category");
if (StringUtils.isBlank(name)) {
name = "Unnamed category";
}
category = new FeedCategory();
category.setName(name);
category.setParent(parent);
category.setUser(user);
feedCategoryDAO.saveOrUpdate(category);
@@ -77,19 +82,22 @@ public class OPMLImporter {
handleOutline(user, child, category);
}
} else {
String title = outline.getText();
if (StringUtils.isBlank(title)) {
title = "Unnamed subscription";
String name = FeedUtils.truncate(outline.getText(), 128);
if (name == null) {
name = FeedUtils.truncate(outline.getTitle(), 128);
}
if (StringUtils.isBlank(name)) {
name = "Unnamed subscription";
}
// make sure we continue with the import process even a feed failed
try {
feedSubscriptionService.subscribe(user, outline.getXmlUrl(), title,
parent);
feedSubscriptionService.subscribe(user, outline.getXmlUrl(),
name, parent);
} catch (FeedSubscriptionException e) {
throw e;
} catch (Exception e) {
log.error("error while importing {}: {}", outline.getXmlUrl(), e.getMessage());
log.error("error while importing {}: {}", outline.getXmlUrl(),
e.getMessage());
}
}
cache.invalidateUserData(user);