|
|
|
@ -65,21 +65,21 @@ public class bookmarksDB {
|
|
|
|
// Declaration of Class-Attributes
|
|
|
|
// Declaration of Class-Attributes
|
|
|
|
// ------------------------------------
|
|
|
|
// ------------------------------------
|
|
|
|
|
|
|
|
|
|
|
|
final static int SORT_ALPHA = 1;
|
|
|
|
//final static int SORT_ALPHA = 1;
|
|
|
|
final static int SORT_SIZE = 2;
|
|
|
|
private final static int SORT_SIZE = 2;
|
|
|
|
final static int SHOW_ALL = -1;
|
|
|
|
private final static int SHOW_ALL = -1;
|
|
|
|
final static String SLEEP_TIME = "3600000"; // default sleepTime: check for recrawls every hour
|
|
|
|
private final static String SLEEP_TIME = "3600000"; // default sleepTime: check for recrawls every hour
|
|
|
|
|
|
|
|
|
|
|
|
// bookmarks
|
|
|
|
// bookmarks
|
|
|
|
MapHeap bookmarks;
|
|
|
|
private MapHeap bookmarks;
|
|
|
|
|
|
|
|
|
|
|
|
// tags
|
|
|
|
// tags
|
|
|
|
ConcurrentHashMap<String, Tag> tags;
|
|
|
|
private ConcurrentHashMap<String, Tag> tags;
|
|
|
|
|
|
|
|
|
|
|
|
// autoReCrawl
|
|
|
|
// autoReCrawl
|
|
|
|
private final BusyThread autoReCrawl;
|
|
|
|
private final BusyThread autoReCrawl;
|
|
|
|
|
|
|
|
|
|
|
|
BookmarkDate dates;
|
|
|
|
private BookmarkDate dates;
|
|
|
|
|
|
|
|
|
|
|
|
// ------------------------------------
|
|
|
|
// ------------------------------------
|
|
|
|
// bookmarksDB's class constructor
|
|
|
|
// bookmarksDB's class constructor
|
|
|
|
@ -99,15 +99,15 @@ public class bookmarksDB {
|
|
|
|
final Iterator<Bookmark> it = new bookmarkIterator(true);
|
|
|
|
final Iterator<Bookmark> it = new bookmarkIterator(true);
|
|
|
|
Bookmark bookmark;
|
|
|
|
Bookmark bookmark;
|
|
|
|
Tag tag;
|
|
|
|
Tag tag;
|
|
|
|
String[] tags;
|
|
|
|
String[] tagArray;
|
|
|
|
while(it.hasNext()){
|
|
|
|
while(it.hasNext()){
|
|
|
|
bookmark = it.next();
|
|
|
|
bookmark = it.next();
|
|
|
|
tags = BookmarkHelper.cleanTagsString(bookmark.getTagsString() + bookmark.getFoldersString()).split(",");
|
|
|
|
tagArray = BookmarkHelper.cleanTagsString(bookmark.getTagsString() + bookmark.getFoldersString()).split(",");
|
|
|
|
tag = null;
|
|
|
|
tag = null;
|
|
|
|
for (int i = 0; i < tags.length; i++) {
|
|
|
|
for (final String element : tagArray) {
|
|
|
|
tag = getTag(BookmarkHelper.tagHash(tags[i]));
|
|
|
|
tag = getTag(BookmarkHelper.tagHash(element));
|
|
|
|
if (tag == null) {
|
|
|
|
if (tag == null) {
|
|
|
|
tag = new Tag(tags[i]);
|
|
|
|
tag = new Tag(element);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
tag.addUrl(bookmark.getUrlHash());
|
|
|
|
tag.addUrl(bookmark.getUrlHash());
|
|
|
|
putTag(tag);
|
|
|
|
putTag(tag);
|
|
|
|
@ -122,9 +122,9 @@ public class bookmarksDB {
|
|
|
|
if (!datesExisted) this.dates.init(new bookmarkIterator(true));
|
|
|
|
if (!datesExisted) this.dates.init(new bookmarkIterator(true));
|
|
|
|
|
|
|
|
|
|
|
|
// autoReCrawl
|
|
|
|
// autoReCrawl
|
|
|
|
Switchboard sb = Switchboard.getSwitchboard();
|
|
|
|
final Switchboard sb = Switchboard.getSwitchboard();
|
|
|
|
this.autoReCrawl = new InstantBusyThread(this, "autoReCrawl", null, null, Long.MIN_VALUE, Long.MAX_VALUE, Long.MIN_VALUE, Long.MAX_VALUE);
|
|
|
|
this.autoReCrawl = new InstantBusyThread(this, "autoReCrawl", null, null, Long.MIN_VALUE, Long.MAX_VALUE, Long.MIN_VALUE, Long.MAX_VALUE);
|
|
|
|
long sleepTime = Long.parseLong(sb.getConfig("autoReCrawl_idlesleep" , SLEEP_TIME));
|
|
|
|
final long sleepTime = Long.parseLong(sb.getConfig("autoReCrawl_idlesleep" , SLEEP_TIME));
|
|
|
|
sb.deployThread("autoReCrawl", "autoReCrawl Scheduler", "simple scheduler for automatic re-crawls of bookmarked urls", null, autoReCrawl, 120000,
|
|
|
|
sb.deployThread("autoReCrawl", "autoReCrawl Scheduler", "simple scheduler for automatic re-crawls of bookmarked urls", null, autoReCrawl, 120000,
|
|
|
|
sleepTime, sleepTime, Long.parseLong(sb.getConfig("autoReCrawl_memprereq" , "-1"))
|
|
|
|
sleepTime, sleepTime, Long.parseLong(sb.getConfig("autoReCrawl_memprereq" , "-1"))
|
|
|
|
);
|
|
|
|
);
|
|
|
|
@ -148,14 +148,14 @@ public class bookmarksDB {
|
|
|
|
public boolean autoReCrawl() {
|
|
|
|
public boolean autoReCrawl() {
|
|
|
|
|
|
|
|
|
|
|
|
// read crontab
|
|
|
|
// read crontab
|
|
|
|
File f = new File (Switchboard.getSwitchboard().getRootPath(),"DATA/SETTINGS/autoReCrawl.conf");
|
|
|
|
final File file = new File (Switchboard.getSwitchboard().getRootPath(),"DATA/SETTINGS/autoReCrawl.conf");
|
|
|
|
String s;
|
|
|
|
String s;
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(f)));
|
|
|
|
final BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(file)));
|
|
|
|
Log.logInfo("BOOKMARKS", "autoReCrawl - reading schedules from " + f);
|
|
|
|
Log.logInfo("BOOKMARKS", "autoReCrawl - reading schedules from " + file);
|
|
|
|
while( null != (s = in.readLine()) ) {
|
|
|
|
while( null != (s = in.readLine()) ) {
|
|
|
|
if (s.length() > 0 && s.charAt(0) != '#') {
|
|
|
|
if (s.length() > 0 && s.charAt(0) != '#') {
|
|
|
|
String parser[] = s.split("\t");
|
|
|
|
final String parser[] = s.split("\t");
|
|
|
|
if (parser.length == 13) {
|
|
|
|
if (parser.length == 13) {
|
|
|
|
folderReCrawl(Long.parseLong(parser[0]), parser[1], parser[2], Integer.parseInt(parser[3]), Long.parseLong(parser[4]),
|
|
|
|
folderReCrawl(Long.parseLong(parser[0]), parser[1], parser[2], Integer.parseInt(parser[3]), Long.parseLong(parser[4]),
|
|
|
|
Integer.parseInt(parser[5]), Integer.parseInt(parser[6]), Boolean.parseBoolean(parser[7]),
|
|
|
|
Integer.parseInt(parser[5]), Integer.parseInt(parser[6]), Boolean.parseBoolean(parser[7]),
|
|
|
|
@ -178,13 +178,14 @@ public class bookmarksDB {
|
|
|
|
} catch( FileNotFoundException ex ) {
|
|
|
|
} catch( FileNotFoundException ex ) {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
Log.logInfo("BOOKMARKS", "autoReCrawl - creating new autoReCrawl.conf");
|
|
|
|
Log.logInfo("BOOKMARKS", "autoReCrawl - creating new autoReCrawl.conf");
|
|
|
|
File inputFile = new File(Switchboard.getSwitchboard().getRootPath(),"defaults/autoReCrawl.conf");
|
|
|
|
final File inputFile = new File(Switchboard.getSwitchboard().getRootPath(),"defaults/autoReCrawl.conf");
|
|
|
|
File outputFile = new File(Switchboard.getSwitchboard().getRootPath(),"DATA/SETTINGS/autoReCrawl.conf");
|
|
|
|
final File outputFile = new File(Switchboard.getSwitchboard().getRootPath(),"DATA/SETTINGS/autoReCrawl.conf");
|
|
|
|
FileReader i = new FileReader(inputFile);
|
|
|
|
final FileReader i = new FileReader(inputFile);
|
|
|
|
FileWriter o = new FileWriter(outputFile);
|
|
|
|
final FileWriter o = new FileWriter(outputFile);
|
|
|
|
int c;
|
|
|
|
int c;
|
|
|
|
while ((c = i.read()) != -1)
|
|
|
|
while ((c = i.read()) != -1) {
|
|
|
|
o.write(c);
|
|
|
|
o.write(c);
|
|
|
|
|
|
|
|
}
|
|
|
|
i.close();
|
|
|
|
i.close();
|
|
|
|
o.close();
|
|
|
|
o.close();
|
|
|
|
autoReCrawl();
|
|
|
|
autoReCrawl();
|
|
|
|
@ -197,7 +198,7 @@ public class bookmarksDB {
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} catch( Exception ex ) {
|
|
|
|
} catch( Exception ex ) {
|
|
|
|
Log.logSevere("BOOKMARKS", "autoReCrawl - error reading " + f, ex);
|
|
|
|
Log.logSevere("BOOKMARKS", "autoReCrawl - error reading " + file, ex);
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
@ -207,30 +208,30 @@ public class bookmarksDB {
|
|
|
|
int crawlingDomFilterDepth, int crawlingDomMaxPages, boolean crawlingQ, boolean indexText, boolean indexMedia,
|
|
|
|
int crawlingDomFilterDepth, int crawlingDomMaxPages, boolean crawlingQ, boolean indexText, boolean indexMedia,
|
|
|
|
boolean crawlOrder, boolean xsstopw, boolean storeHTCache, int cacheStrategy) {
|
|
|
|
boolean crawlOrder, boolean xsstopw, boolean storeHTCache, int cacheStrategy) {
|
|
|
|
|
|
|
|
|
|
|
|
Switchboard sb = Switchboard.getSwitchboard();
|
|
|
|
final Switchboard sb = Switchboard.getSwitchboard();
|
|
|
|
Iterator<String> bit=getBookmarksIterator(folder, true);
|
|
|
|
final Iterator<String> bit = getBookmarksIterator(folder, true);
|
|
|
|
Log.logInfo("BOOKMARKS", "autoReCrawl - processing: "+folder);
|
|
|
|
Log.logInfo("BOOKMARKS", "autoReCrawl - processing: "+folder);
|
|
|
|
|
|
|
|
|
|
|
|
boolean xdstopw = xsstopw;
|
|
|
|
final boolean xdstopw = xsstopw;
|
|
|
|
boolean xpstopw = xsstopw;
|
|
|
|
final boolean xpstopw = xsstopw;
|
|
|
|
|
|
|
|
|
|
|
|
while(bit.hasNext()) {
|
|
|
|
while(bit.hasNext()) {
|
|
|
|
|
|
|
|
|
|
|
|
Bookmark bm = getBookmark(bit.next());
|
|
|
|
final Bookmark bm = getBookmark(bit.next());
|
|
|
|
long sleepTime = Long.parseLong(sb.getConfig("autoReCrawl_idlesleep" , SLEEP_TIME));
|
|
|
|
final long sleepTime = Long.parseLong(sb.getConfig("autoReCrawl_idlesleep" , SLEEP_TIME));
|
|
|
|
long interTime = (System.currentTimeMillis()-bm.getTimeStamp())%schedule;
|
|
|
|
final long interTime = (System.currentTimeMillis()-bm.getTimeStamp())%schedule;
|
|
|
|
|
|
|
|
|
|
|
|
Date date=new Date(bm.getTimeStamp());
|
|
|
|
final Date date = new Date(bm.getTimeStamp());
|
|
|
|
Log.logInfo("BOOKMARKS", "autoReCrawl - checking schedule for: "+"["+DateFormatter.formatISO8601(date)+"] "+bm.getUrl());
|
|
|
|
Log.logInfo("BOOKMARKS", "autoReCrawl - checking schedule for: "+"["+DateFormatter.formatISO8601(date)+"] "+bm.getUrl());
|
|
|
|
|
|
|
|
|
|
|
|
if (interTime >= 0 && interTime < sleepTime) {
|
|
|
|
if (interTime >= 0 && interTime < sleepTime) {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
int pos = 0;
|
|
|
|
int pos = 0;
|
|
|
|
// set crawlingStart to BookmarkUrl
|
|
|
|
// set crawlingStart to BookmarkUrl
|
|
|
|
String crawlingStart = bm.getUrl();
|
|
|
|
final String crawlingStart = bm.getUrl();
|
|
|
|
String newcrawlingMustMatch = crawlingfilter;
|
|
|
|
String newcrawlingMustMatch = crawlingfilter;
|
|
|
|
|
|
|
|
|
|
|
|
DigestURI crawlingStartURL = new DigestURI(crawlingStart, null);
|
|
|
|
final DigestURI crawlingStartURL = new DigestURI(crawlingStart, null);
|
|
|
|
|
|
|
|
|
|
|
|
// set the crawling filter
|
|
|
|
// set the crawling filter
|
|
|
|
if (newcrawlingMustMatch.length() < 2) newcrawlingMustMatch = ".*"; // avoid that all urls are filtered out if bad value was submitted
|
|
|
|
if (newcrawlingMustMatch.length() < 2) newcrawlingMustMatch = ".*"; // avoid that all urls are filtered out if bad value was submitted
|
|
|
|
@ -245,14 +246,15 @@ public class bookmarksDB {
|
|
|
|
// check if the crawl filter works correctly
|
|
|
|
// check if the crawl filter works correctly
|
|
|
|
Pattern.compile(newcrawlingMustMatch);
|
|
|
|
Pattern.compile(newcrawlingMustMatch);
|
|
|
|
|
|
|
|
|
|
|
|
byte[] urlhash = crawlingStartURL.hash();
|
|
|
|
final byte[] urlhash = crawlingStartURL.hash();
|
|
|
|
|
|
|
|
|
|
|
|
sb.indexSegments.urlMetadata(Segments.Process.LOCALCRAWLING).remove(urlhash);
|
|
|
|
sb.indexSegments.urlMetadata(Segments.Process.LOCALCRAWLING).remove(urlhash);
|
|
|
|
sb.crawlQueues.noticeURL.removeByURLHash(urlhash);
|
|
|
|
sb.crawlQueues.noticeURL.removeByURLHash(urlhash);
|
|
|
|
sb.crawlQueues.errorURL.remove(urlhash);
|
|
|
|
sb.crawlQueues.errorURL.remove(urlhash);
|
|
|
|
|
|
|
|
|
|
|
|
// stack url
|
|
|
|
// stack url
|
|
|
|
sb.crawler.profilesPassiveCrawls.removeEntry(crawlingStartURL.hash()); // if there is an old entry, delete it
|
|
|
|
sb.crawler.profilesPassiveCrawls.removeEntry(crawlingStartURL.hash()); // if there is an old entry, delete it
|
|
|
|
CrawlProfile.entry pe = sb.crawler.profilesActiveCrawls.newEntry(
|
|
|
|
final CrawlProfile.entry pe = sb.crawler.profilesActiveCrawls.newEntry(
|
|
|
|
folder+"/"+crawlingStartURL, crawlingStartURL,
|
|
|
|
folder+"/"+crawlingStartURL, crawlingStartURL,
|
|
|
|
newcrawlingMustMatch,
|
|
|
|
newcrawlingMustMatch,
|
|
|
|
CrawlProfile.MATCH_BAD_URL,
|
|
|
|
CrawlProfile.MATCH_BAD_URL,
|
|
|
|
@ -295,7 +297,6 @@ public class bookmarksDB {
|
|
|
|
} catch (MalformedURLException e1) {}
|
|
|
|
} catch (MalformedURLException e1) {}
|
|
|
|
} // if
|
|
|
|
} // if
|
|
|
|
} // while(bit.hasNext())
|
|
|
|
} // while(bit.hasNext())
|
|
|
|
return;
|
|
|
|
|
|
|
|
} // } autoReCrawl()
|
|
|
|
} // } autoReCrawl()
|
|
|
|
|
|
|
|
|
|
|
|
// -----------------------------------------------------------
|
|
|
|
// -----------------------------------------------------------
|
|
|
|
@ -323,7 +324,7 @@ public class bookmarksDB {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
public String addBookmark(final Bookmark bookmark){
|
|
|
|
public String addBookmark(final Bookmark bookmark){
|
|
|
|
saveBookmark(bookmark);
|
|
|
|
this.saveBookmark(bookmark);
|
|
|
|
return bookmark.getUrlHash();
|
|
|
|
return bookmark.getUrlHash();
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -331,8 +332,7 @@ public class bookmarksDB {
|
|
|
|
public Bookmark getBookmark(final String urlHash){
|
|
|
|
public Bookmark getBookmark(final String urlHash){
|
|
|
|
try {
|
|
|
|
try {
|
|
|
|
final Map<String, String> map = bookmarks.get(urlHash);
|
|
|
|
final Map<String, String> map = bookmarks.get(urlHash);
|
|
|
|
if (map == null) return null;
|
|
|
|
return (map == null) ? new Bookmark(map) : null;
|
|
|
|
return new Bookmark(map);
|
|
|
|
|
|
|
|
} catch (final IOException e) {
|
|
|
|
} catch (final IOException e) {
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -341,9 +341,9 @@ public class bookmarksDB {
|
|
|
|
public boolean removeBookmark(final String urlHash){
|
|
|
|
public boolean removeBookmark(final String urlHash){
|
|
|
|
final Bookmark bookmark = getBookmark(urlHash);
|
|
|
|
final Bookmark bookmark = getBookmark(urlHash);
|
|
|
|
if (bookmark == null) return false; //does not exist
|
|
|
|
if (bookmark == null) return false; //does not exist
|
|
|
|
final Set<String> tags = bookmark.getTags();
|
|
|
|
final Set<String> tagSet = bookmark.getTags();
|
|
|
|
bookmarksDB.Tag tag=null;
|
|
|
|
bookmarksDB.Tag tag=null;
|
|
|
|
final Iterator<String> it=tags.iterator();
|
|
|
|
final Iterator<String> it=tagSet.iterator();
|
|
|
|
while(it.hasNext()){
|
|
|
|
while(it.hasNext()){
|
|
|
|
tag=getTag(BookmarkHelper.tagHash(it.next()));
|
|
|
|
tag=getTag(BookmarkHelper.tagHash(it.next()));
|
|
|
|
if(tag!=null){
|
|
|
|
if(tag!=null){
|
|
|
|
@ -442,7 +442,7 @@ public class bookmarksDB {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private Iterator<Tag> getTagIterator(final boolean priv, final int c) {
|
|
|
|
private Iterator<Tag> getTagIterator(final boolean priv, final int c) {
|
|
|
|
final TreeSet<Tag> set=new TreeSet<Tag>((c == SORT_SIZE) ? tagSizeComparator : tagComparator);
|
|
|
|
final Set<Tag> set = new TreeSet<Tag>((c == SORT_SIZE) ? tagSizeComparator : tagComparator);
|
|
|
|
final Iterator<Tag> it = this.tags.values().iterator();
|
|
|
|
final Iterator<Tag> it = this.tags.values().iterator();
|
|
|
|
Tag tag;
|
|
|
|
Tag tag;
|
|
|
|
while (it.hasNext()) {
|
|
|
|
while (it.hasNext()) {
|
|
|
|
@ -474,11 +474,11 @@ public class bookmarksDB {
|
|
|
|
final Iterator<String> bit=getBookmarksIterator(tagName, priv);
|
|
|
|
final Iterator<String> bit=getBookmarksIterator(tagName, priv);
|
|
|
|
Bookmark bm;
|
|
|
|
Bookmark bm;
|
|
|
|
Tag tag;
|
|
|
|
Tag tag;
|
|
|
|
Set<String> tags;
|
|
|
|
Set<String> tagSet;
|
|
|
|
while(bit.hasNext()){
|
|
|
|
while(bit.hasNext()){
|
|
|
|
bm=getBookmark(bit.next());
|
|
|
|
bm=getBookmark(bit.next());
|
|
|
|
tags = bm.getTags();
|
|
|
|
tagSet = bm.getTags();
|
|
|
|
it = tags.iterator();
|
|
|
|
it = tagSet.iterator();
|
|
|
|
while (it.hasNext()) {
|
|
|
|
while (it.hasNext()) {
|
|
|
|
tag=getTag(BookmarkHelper.tagHash(it.next()) );
|
|
|
|
tag=getTag(BookmarkHelper.tagHash(it.next()) );
|
|
|
|
if(priv ||tag.hasPublicItems()){
|
|
|
|
if(priv ||tag.hasPublicItems()){
|
|
|
|
@ -512,14 +512,14 @@ public class bookmarksDB {
|
|
|
|
if (oldTag != null) {
|
|
|
|
if (oldTag != null) {
|
|
|
|
final Set<String> urlHashes = oldTag.getUrlHashes(); // preserve urlHashes of oldTag
|
|
|
|
final Set<String> urlHashes = oldTag.getUrlHashes(); // preserve urlHashes of oldTag
|
|
|
|
removeTag(BookmarkHelper.tagHash(oldName)); // remove oldHash from TagsDB
|
|
|
|
removeTag(BookmarkHelper.tagHash(oldName)); // remove oldHash from TagsDB
|
|
|
|
final Iterator<String> it = urlHashes.iterator();
|
|
|
|
|
|
|
|
Bookmark bookmark;
|
|
|
|
Bookmark bookmark;
|
|
|
|
Set<String> tags = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
|
|
|
|
Set<String> tagSet = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
|
|
|
|
while (it.hasNext()) { // looping through all bookmarks which were tagged with oldName
|
|
|
|
for (String urlHash : urlHashes) { // looping through all bookmarks which were tagged with oldName
|
|
|
|
bookmark = getBookmark(it.next());
|
|
|
|
bookmark = getBookmark(urlHash);
|
|
|
|
tags = bookmark.getTags();
|
|
|
|
tagSet = bookmark.getTags();
|
|
|
|
tags.remove(oldName);
|
|
|
|
tagSet.remove(oldName);
|
|
|
|
bookmark.setTags(tags, true); // might not be needed, but doesn't hurt
|
|
|
|
bookmark.setTags(tagSet, true); // might not be needed, but doesn't hurt
|
|
|
|
if(!newName.equals("")) bookmark.addTag(newName);
|
|
|
|
if(!newName.equals("")) bookmark.addTag(newName);
|
|
|
|
saveBookmark(bookmark);
|
|
|
|
saveBookmark(bookmark);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -529,10 +529,10 @@ public class bookmarksDB {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void addTag(final String selectTag, final String newTag) {
|
|
|
|
public void addTag(final String selectTag, final String newTag) {
|
|
|
|
final Iterator<String> it = getTag(BookmarkHelper.tagHash(selectTag)).getUrlHashes().iterator(); // get urlHashes for selectTag
|
|
|
|
|
|
|
|
Bookmark bookmark;
|
|
|
|
Bookmark bookmark;
|
|
|
|
while (it.hasNext()) { // looping through all bookmarks which were tagged with selectTag
|
|
|
|
for (final String urlHash : getTag(BookmarkHelper.tagHash(selectTag)).getUrlHashes()) { // looping through all bookmarks which were tagged with selectTag
|
|
|
|
bookmark = getBookmark(it.next());
|
|
|
|
bookmark = getBookmark(urlHash);
|
|
|
|
bookmark.addTag(newTag);
|
|
|
|
bookmark.addTag(newTag);
|
|
|
|
saveBookmark(bookmark);
|
|
|
|
saveBookmark(bookmark);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -555,11 +555,12 @@ public class bookmarksDB {
|
|
|
|
public Tag(final String hash, final Map<String, String> map){
|
|
|
|
public Tag(final String hash, final Map<String, String> map){
|
|
|
|
tagHash = hash;
|
|
|
|
tagHash = hash;
|
|
|
|
mem = map;
|
|
|
|
mem = map;
|
|
|
|
if(mem.containsKey(URL_HASHES))
|
|
|
|
if (mem.containsKey(URL_HASHES)) {
|
|
|
|
urlHashes = listManager.string2set(mem.get(URL_HASHES));
|
|
|
|
urlHashes = listManager.string2set(mem.get(URL_HASHES));
|
|
|
|
else
|
|
|
|
} else {
|
|
|
|
urlHashes = new HashSet<String>();
|
|
|
|
urlHashes = new HashSet<String>();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Tag(final String name, final HashSet<String> entries){
|
|
|
|
public Tag(final String name, final HashSet<String> entries){
|
|
|
|
tagHash = BookmarkHelper.tagHash(name);
|
|
|
|
tagHash = BookmarkHelper.tagHash(name);
|
|
|
|
@ -570,12 +571,9 @@ public class bookmarksDB {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Tag(final String name){
|
|
|
|
public Tag(final String name){
|
|
|
|
tagHash=BookmarkHelper.tagHash(name);
|
|
|
|
this(name, new HashSet<String>());
|
|
|
|
mem=new HashMap<String, String>();
|
|
|
|
|
|
|
|
//mem.put(URL_HASHES, "");
|
|
|
|
|
|
|
|
urlHashes=new HashSet<String>();
|
|
|
|
|
|
|
|
mem.put(TAG_NAME, name);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Map<String, String> getMap(){
|
|
|
|
public Map<String, String> getMap(){
|
|
|
|
mem.put(URL_HASHES, listManager.collection2string(this.urlHashes));
|
|
|
|
mem.put(URL_HASHES, listManager.collection2string(this.urlHashes));
|
|
|
|
return mem;
|
|
|
|
return mem;
|
|
|
|
@ -615,11 +613,7 @@ public class bookmarksDB {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public boolean hasPublicItems(){
|
|
|
|
public boolean hasPublicItems(){
|
|
|
|
final Iterator<String> it=getBookmarksIterator(this.getTagName(), false);
|
|
|
|
return getBookmarksIterator(this.getTagName(), false).hasNext();
|
|
|
|
if(it.hasNext()){
|
|
|
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public void addUrl(final String urlHash){
|
|
|
|
public void addUrl(final String urlHash){
|
|
|
|
@ -651,16 +645,28 @@ public class bookmarksDB {
|
|
|
|
private String urlHash;
|
|
|
|
private String urlHash;
|
|
|
|
private Set<String> tagNames;
|
|
|
|
private Set<String> tagNames;
|
|
|
|
private long timestamp;
|
|
|
|
private long timestamp;
|
|
|
|
Map<String, String> entry;
|
|
|
|
private Map<String, String> entry;
|
|
|
|
|
|
|
|
|
|
|
|
public Bookmark(final String urlHash, final Map<String, String> map) {
|
|
|
|
public Bookmark(final String urlHash, final Map<String, String> map) {
|
|
|
|
this.entry = map;
|
|
|
|
entry = map;
|
|
|
|
this.urlHash = urlHash;
|
|
|
|
this.urlHash = urlHash;
|
|
|
|
tagNames = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
|
|
|
|
tagNames = new TreeSet<String>(String.CASE_INSENSITIVE_ORDER);
|
|
|
|
if (map.containsKey(BOOKMARK_TAGS)) tagNames.addAll(listManager.string2set(map.get(BOOKMARK_TAGS)));
|
|
|
|
if (map.containsKey(BOOKMARK_TAGS)) tagNames.addAll(listManager.string2set(map.get(BOOKMARK_TAGS)));
|
|
|
|
loadTimestamp();
|
|
|
|
loadTimestamp();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Bookmark(final String urlHash, final String url) {
|
|
|
|
|
|
|
|
entry = new HashMap<String, String>();
|
|
|
|
|
|
|
|
this.urlHash = urlHash;
|
|
|
|
|
|
|
|
entry.put(BOOKMARK_URL, url);
|
|
|
|
|
|
|
|
tagNames = new HashSet<String>();
|
|
|
|
|
|
|
|
timestamp = System.currentTimeMillis();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Bookmark(final String urlHash, final DigestURI url) {
|
|
|
|
|
|
|
|
this(urlHash, url.toNormalform(false, true));
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Bookmark(String url){
|
|
|
|
public Bookmark(String url){
|
|
|
|
entry = new HashMap<String, String>();
|
|
|
|
entry = new HashMap<String, String>();
|
|
|
|
if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://")) {
|
|
|
|
if (!url.toLowerCase().startsWith("http://") && !url.toLowerCase().startsWith("https://")) {
|
|
|
|
@ -687,22 +693,6 @@ public class bookmarksDB {
|
|
|
|
removeBookmark(this.urlHash); //prevent empty tags
|
|
|
|
removeBookmark(this.urlHash); //prevent empty tags
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Bookmark(final String urlHash, final DigestURI url) {
|
|
|
|
|
|
|
|
entry = new HashMap<String, String>();
|
|
|
|
|
|
|
|
this.urlHash=urlHash;
|
|
|
|
|
|
|
|
entry.put(BOOKMARK_URL, url.toNormalform(false, true));
|
|
|
|
|
|
|
|
tagNames=new HashSet<String>();
|
|
|
|
|
|
|
|
timestamp=System.currentTimeMillis();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Bookmark(final String urlHash, final String url) {
|
|
|
|
|
|
|
|
entry = new HashMap<String, String>();
|
|
|
|
|
|
|
|
this.urlHash=urlHash;
|
|
|
|
|
|
|
|
entry.put(BOOKMARK_URL, url);
|
|
|
|
|
|
|
|
tagNames=new HashSet<String>();
|
|
|
|
|
|
|
|
timestamp=System.currentTimeMillis();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public Bookmark(final Map<String, String> map) throws MalformedURLException {
|
|
|
|
public Bookmark(final Map<String, String> map) throws MalformedURLException {
|
|
|
|
this(new String((new DigestURI(map.get(BOOKMARK_URL), null)).hash()), map);
|
|
|
|
this(new String((new DigestURI(map.get(BOOKMARK_URL), null)).hash()), map);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -732,24 +722,26 @@ public class bookmarksDB {
|
|
|
|
|
|
|
|
|
|
|
|
public String getTagsString() {
|
|
|
|
public String getTagsString() {
|
|
|
|
final String s[] = listManager.collection2string(getTags()).split(",");
|
|
|
|
final String s[] = listManager.collection2string(getTags()).split(",");
|
|
|
|
String tagsString="";
|
|
|
|
final StringBuilder stringBuilder = new StringBuilder();
|
|
|
|
for (int i=0; i<s.length; i++){
|
|
|
|
for (final String element : s){
|
|
|
|
if(!s[i].startsWith("/")){
|
|
|
|
if(!element.startsWith("/")){
|
|
|
|
tagsString += s[i]+",";
|
|
|
|
stringBuilder.append(element);
|
|
|
|
|
|
|
|
stringBuilder.append(",");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return tagsString;
|
|
|
|
return stringBuilder.toString();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public String getFoldersString(){
|
|
|
|
public String getFoldersString(){
|
|
|
|
final String s[] = listManager.collection2string(getTags()).split(",");
|
|
|
|
final String s[] = listManager.collection2string(getTags()).split(",");
|
|
|
|
String foldersString="";
|
|
|
|
final StringBuilder stringBuilder = new StringBuilder();
|
|
|
|
for (int i=0; i<s.length; i++){
|
|
|
|
for (final String element : s){
|
|
|
|
if(s[i].startsWith("/")){
|
|
|
|
if(!element.startsWith("/")){
|
|
|
|
foldersString += s[i]+",";
|
|
|
|
stringBuilder.append(element);
|
|
|
|
|
|
|
|
stringBuilder.append(",");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return foldersString;
|
|
|
|
return stringBuilder.toString();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public String getDescription(){
|
|
|
|
public String getDescription(){
|
|
|
|
@ -834,9 +826,7 @@ public class bookmarksDB {
|
|
|
|
public void setTags(final Set<String> tags2, final boolean local){
|
|
|
|
public void setTags(final Set<String> tags2, final boolean local){
|
|
|
|
tagNames = tags2; // TODO: check if this is safe
|
|
|
|
tagNames = tags2; // TODO: check if this is safe
|
|
|
|
// tags.addAll(tags2); // in order for renameTag() to work I had to change this form 'add' to 'set'
|
|
|
|
// tags.addAll(tags2); // in order for renameTag() to work I had to change this form 'add' to 'set'
|
|
|
|
final Iterator<String> it=tagNames.iterator();
|
|
|
|
for (final String tagName : tagNames) {
|
|
|
|
while(it.hasNext()){
|
|
|
|
|
|
|
|
final String tagName=it.next();
|
|
|
|
|
|
|
|
Tag tag = getTag(BookmarkHelper.tagHash(tagName));
|
|
|
|
Tag tag = getTag(BookmarkHelper.tagHash(tagName));
|
|
|
|
if (tag == null) {
|
|
|
|
if (tag == null) {
|
|
|
|
tag = new Tag(tagName);
|
|
|
|
tag = new Tag(tagName);
|
|
|
|
@ -882,10 +872,10 @@ public class bookmarksDB {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Bookmark next() {
|
|
|
|
public Bookmark next() {
|
|
|
|
try {
|
|
|
|
if (hasNext()) {
|
|
|
|
String s = new String(this.bookmarkIter.next());
|
|
|
|
String s = new String(this.bookmarkIter.next());
|
|
|
|
return getBookmark(s);
|
|
|
|
return getBookmark(s);
|
|
|
|
} catch (final kelondroException e) {
|
|
|
|
} else {
|
|
|
|
//resetDatabase();
|
|
|
|
//resetDatabase();
|
|
|
|
return null;
|
|
|
|
return null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -913,8 +903,9 @@ public class bookmarksDB {
|
|
|
|
public int compare(final String obj1, final String obj2) {
|
|
|
|
public int compare(final String obj1, final String obj2) {
|
|
|
|
final Bookmark bm1 = getBookmark(obj1);
|
|
|
|
final Bookmark bm1 = getBookmark(obj1);
|
|
|
|
final Bookmark bm2 = getBookmark(obj2);
|
|
|
|
final Bookmark bm2 = getBookmark(obj2);
|
|
|
|
if(bm1==null || bm2==null)
|
|
|
|
if (bm1 == null || bm2 == null) {
|
|
|
|
return 0; //XXX: i think this should not happen? maybe this needs further tracing of the bug
|
|
|
|
return 0; //XXX: i think this should not happen? maybe this needs further tracing of the bug
|
|
|
|
|
|
|
|
}
|
|
|
|
if (this.newestFirst){
|
|
|
|
if (this.newestFirst){
|
|
|
|
if (bm2.getTimeStamp() - bm1.getTimeStamp() >0) return 1;
|
|
|
|
if (bm2.getTimeStamp() - bm1.getTimeStamp() >0) return 1;
|
|
|
|
return -1;
|
|
|
|
return -1;
|
|
|
|
@ -951,9 +942,13 @@ public class bookmarksDB {
|
|
|
|
private static final long serialVersionUID = 4149185397646373251L;
|
|
|
|
private static final long serialVersionUID = 4149185397646373251L;
|
|
|
|
|
|
|
|
|
|
|
|
public int compare(final Tag obj1, final Tag obj2) {
|
|
|
|
public int compare(final Tag obj1, final Tag obj2) {
|
|
|
|
if (obj1.size() < obj2.size()) return 1;
|
|
|
|
if (obj1.size() < obj2.size()) {
|
|
|
|
else if (obj1.getTagName().equals(obj2.getTagName())) return 0;
|
|
|
|
return 1;
|
|
|
|
else return -1;
|
|
|
|
} else if (obj1.getTagName().equals(obj2.getTagName())) {
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
low012
15 years ago