Skip to content

Commit

Permalink
[Log2Log v1.0.2] 4 bugfixes:
Browse files Browse the repository at this point in the history 
- FIX: Trillian protocol chart corrections
- FIX: Facebook names converted to Facebook XMPP for Trillian
- FIX: Trillian distinguishes "GOOGLE" and "JABBER" protocols
  • Loading branch information
Nick Liu committed Jul 3, 2012
1 parent 7b5508e commit 21c9eba
Show file tree
Hide file tree
Showing 3 changed files with 110 additions and 45 deletions.
133 changes: 94 additions & 39 deletions README.txt
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,50 @@
[Log2Log Chat Log Converter]

###############################################################################
# !! IMPORTANT INFORMATION ! IMPORTANT INFORMATION ! IMPORTANT INFORMATION !! #
###############################################################################
# The Log2Log v1.x branch has been deprecated. This is the final release of #
# Log2Log v1.x (v1.0.2) as of 03 July 2012. You may ask for a custom-built #
# release; Deltik will help you support new format converters if you ask. #
# #
# Development is paused due to a lack of interest in the Log2Log project and #
# many kinds of technical difficulties and impracticalities. It's #
# - ugly (poor coding practices), #
# - inflexible (no foreign language support), #
# - inextensible (no plugin support), #
# - bulky (unoptimized), #
# - and leaky (no memory management whatsoever!). #
# #
# A Log2Log v2.x branch is planned, but there are not enough human resources #
# to make the project possible. #
# #
# Version 2 shall #
# - improve memory management drastically, #
# - take advantage of multiple threads (GUI, reading source data, #
# converting to destination format, saving converted data), #
# - have multilingual support, #
# - and have format converters in a modular plug-in design. #
# #
# The Loguntu project might also be started along with Log2Log v2.x. Loguntu #
# is planned to be the ultimate digital life interface for all personal data. #
# It looks really awesome on paper, but this readme isn't the place to #
# describe it. #
# #
# If you're interested in the Loguntu project or seeing the Log2Log project #
# go further, just let us know at <http://loguntu.deltik.org/>. #
# (The link works as of 03 July 2012. I'll try to keep it up for a while.) #
# #
# And there's always <http://www.deltik.org/>. :) #
###############################################################################

╔═══════════════════════════════════════════╤═╤═╤═╗
║Information │-│■│X║
╟───────────────────────────────────────────┴─┴─┴─╢
║Version: 1.0.0 (v1.0.0) ║
║Version: 1.0.2 (v1.0.2) ║
║Website: http://www.deltik.org/ ║
║Information: http://log2log.sf.net/ ║
║E-Mail: [email protected] ║
║Release Date: 2011/10/01 ║
║Release Date: 2012/07/03 ║
╚═════════════════════════════════════════════════╝

▛▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▜
Expand Down Expand Up @@ -65,39 +102,41 @@ Install Log2Log in three easy steps:
1. Open the Log2Log DMG file.
2. Drag the Log2Log application into your Applications directory.
3. There is no step 3.

┌────────────┐
│ UBUNTU PPA │
└────────────┘
1. sudo add-apt-repository ppa:deltik/loguntu
2. sudo apt-get install log2log
3. There is no step 3.

┌───────────────────┐
│ DEBIAN/UBUNTU DEB │
└───────────────────┘
1. Open the Log2Log DEB file.
2. Confirm the installation.
3. There is no step 3.

┌────────────────────┐
│ FEDORA/RED HAT RPM │
└────────────────────┘
1. Open the Log2Log RPM file.
2. Confirm the installation.
3. There is no step 3.

┌────────────┐
│ LINUX/UNIX │
└────────────┘
If you downloaded the Log2Log executable, you have it. To make "log2log" a
command, move the executable to /usr/bin .
Dependencies can be matched with the command:
ldd log2log


┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
┃ CONFIGURATION AND FEATURES ┃
┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
Log2Log v1.0.0 does not have any configurable options. Is there something you
Log2Log v1.0.2 does not have any configurable options. Is there something you
want to be configurable? Suggest it to the project manager (email address in the
"More Information" section)!

Expand All @@ -106,23 +145,24 @@ want to be configurable? Suggest it to the project manager (email address in th
└───────────────────┘
Here is an informational table about Log2Log's format converters:

NAME FROM? TO? SUPPORT INTRODUCED
Adium no no planning
NAME FROM? TO? SUPPORT INTRODUCED RETIRED
Adium no no planning
AIM yes no stable v1.0.0
Digsby no no considered
Empathy no no planning
Facebook (dl) no never planning
Gmail Chats (dl) no never planning
Google Voice (dl) no never planning
imo.im (dl) no never planning
Kopete no no considered
Empathy no no planning
Facebook (dl) no never planning
Gmail Chats (dl) no never planning
Google Voice (dl) no never planning
imo.im (dl) no never planning
Kopete no no considered
Log2Log JSON yes yes stable v0.0.1a1
Meebo (dl) no never pre-alpha v0.0.1a1
Meebo (dl) no never pre-alpha v0.0.1a1 v1.0.1
Meebo (farewell) yes no stable v1.0.1
Meebo yes yes stable v0.0.1a1
Minecraft Server no no dev
Minecraft Server no no dev
Omegle yes yes stable v1.0.0
Pidgin HTML yes no alpha v0.0.1a1
Skype no never planning
Skype no never planning
Trillian yes yes beta v1.0.0
WLM yes no stable v1.0.0

Expand Down Expand Up @@ -156,10 +196,10 @@ compatibility, see the "Configuration and Features" section.
2. Converting chat log formats is no easy task. Note that Log2Log converters
might not be 100% successful at converting chat logs.

3. Time zone compatibility is rough as of v1.0.0, but fixes are underway.
3. Time zone compatibility is rough as of v1.0.2, but fixes are underway.

4. Languages other than English have not been figured out for format
converters as of v1.0.0. The Log2Log team would greatly appreciate it if
converters as of v1.0.2. The Log2Log team would greatly appreciate it if
you could design a translations system for us. :)

5. This project would like help. If you would like to contribute to Log2Log in
Expand All @@ -182,37 +222,52 @@ You can contact the project manager, Nick Liu, too: <[email protected]>
┏━━━━━━━━━━━━━━━━━┓
┃ VERSION HISTORY ┃
┗━━━━━━━━━━━━━━━━━┛
1.0.2 (2012/07/03)
- INF: The Log2Log v1.x branch is deprecated.
- FIX: Improved Trillian `To` format converter protocol conversions, especially for Facebook and Google Talk

1.0.1 (2012/06/23)
- INF: The Log2Log v1.x branch is being discontinued.
- NEW: Meebo (farewell) format converter
- NEW: You can now use the [Enter] key in a text field to start the conversion.
- FIX: Default paths work now.
- MOD: Cleaned up the user interface

1.0.0 (2011/10/01)
- NEW: Initial Release
- NEW: Initial Release
- NEW: Omegle format converter
- NEW: Trillian format converter
- NEW: WLM `From` format converter
- NEW: AIM `From` format converter

1.0.0dev (2011/06/23)
- Log2Log as a desktop application: Development planning
- Log2Log as a desktop application: Development planning

0.0.1a4 (2011/06/23)
- INF: The Log2Log PHP project is being discontinued.
- FIX: Fixed form security issue of the MeeboConnect interface by switching to POST
- MOD: MeeboConnect interface allows for capture threshold setting
- MOD: MeeboConnect interface form submits relative to its location
- DEV: Added debug information for importing chat log structure
- PRE: Google Talk is now under consideration.
- INF: The Log2Log PHP project is being discontinued.
- FIX: Fixed form security issue of the MeeboConnect interface by switching to POST
- MOD: MeeboConnect interface allows for capture threshold setting
- MOD: MeeboConnect interface form submits relative to its location
- DEV: Added debug information for importing chat log structure
- PRE: Google Talk is now under consideration.

0.0.1a3 (2011/03/28)
- NEW: Option to include conversion debug logs in the generated archive
- FIX: Pidgin.php: Improved support for conversation events
- FIX: For chat log developers, the template file had a function correction.
- MOD: Log2Log Standard Chat Log Format now stores timezone definitions.
- NEW: Option to include conversion debug logs in the generated archive
- FIX: Pidgin.php: Improved support for conversation events
- FIX: For chat log developers, the template file had a function correction.
- MOD: Log2Log Standard Chat Log Format now stores timezone definitions.

0.0.1a2 (2011/03/27)
- NEW: JSON.php: Direct export of the Log2Log Standard Chat Log Format in JSON
- NEW: Debug error handler
- FIX: Pidgin.php: Prevented processing chat log entry if corrupt
- MOD: core.php: Incompatible archive types now pass warnings instead of errors.
- NEW: JSON.php: Direct export of the Log2Log Standard Chat Log Format in JSON
- NEW: Debug error handler
- FIX: Pidgin.php: Prevented processing chat log entry if corrupt
- MOD: core.php: Incompatible archive types now pass warnings instead of errors.

0.0.1a1 (2011/03/19)
- Initial Release
- Initial Release

0.0.1dev (2011/01/07)
- Development Layout
- Development Layout

0.0.1pre (2011/01/01)
- Log2Log Project Founded
- Log2Log Project Founded
20 changes: 15 additions & 5 deletions formats/trillian.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ Trillian::Trillian()
chart["ASTRA"] = "astra";
chart["BONJOUR"] = "bonjour";
chart["FACEBOOK"] = "facebook";
chart["GOOGLE"] = "jabber";
chart["GOOGLE"] = "gtalk";
chart["JABBER"] = "jabber";
chart["ICQ"] = "icq";
chart["IRC"] = "irc";
chart["MSN"] = "msn";
chart["SKYPE"] = "skype";
chart["YAHOO"] = "yim";
chart["YAHOO"] = "yahoo";
}

/**
Expand Down Expand Up @@ -204,7 +204,7 @@ QVariant Trillian::generate(StdFormat *$log)
QString $timezone_base = $log->getTimezone();

// Trillian-ize the protocol
QString protocol;
QString protocol = $protocol;
QMap<QString, QVariant>::const_iterator i = chart.constBegin();
while (i != chart.constEnd())
{
Expand All @@ -214,8 +214,18 @@ QVariant Trillian::generate(StdFormat *$log)
}
++ i;
}
if (protocol.isEmpty())
protocol = $protocol.toUpper();
protocol = $protocol.toUpper();

// START PATCH: Proper FACEBOOK naming
if (protocol.toLower() == "facebook" && QVariant($with).toLongLong() > 0 && !$with.contains("chat.facebook.com"))
$with = "-" + $with + "@chat.facebook.com";
// END PATCH

// START PATCH: Proper GOOGLE naming (not 100% accurate, but gets most people's personal GMail addresses)
if (protocol.toLower() == "jabber" && ($account.endsWith("@gmail.com") ||
$account.endsWith("@googlemail.com")))
protocol = "GOOGLE";
// END PATCH

// Find associated individual, if existing
$individual = $individuals[protocol + "/Query/" + $with + ".xml"].toHash();
Expand Down
2 changes: 1 addition & 1 deletion update.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define VERSION "1.0.1"
#define VERSION "1.0.2"
#define DL_SOURCE "http://log2log.sourceforge.net/update/"

/**
Expand Down

0 comments on commit 21c9eba

Please sign in to comment.