The problem described in bug #309259 actually stems from 2 things:
1) Gmail changed their message encoding. Quoting upstream, "The
fixQuotedPrintable() function fixed this problem".
2) Quoting Richard again "whenever and old file was changed the
old file which was now in the trash was being returned [...] The
change to the _messages[] indexes fix that problem".
Starting from there, here is a complete description of the changes
between the gmailfs.py from 0.3-9 in Debian and the one from 0.4
upstream:
> --- /usr/share/gmailfs/gmailfs.py 2005-04-12 01:47:36.000000000 -0700
> +++ 0.4/gmailfs-0.4/gmailfs.py 2005-05-15 00:18:16.000000000 -0700
> @@ -24,9 +24,9 @@
> from stat import *
>
> import thread
> -
> +import quopri
Related to #1: needed in order to implement the fixQuotedPrintable()
function below
> import libgmail
> -from libgmail.constants import *
> +from constants import *
This is due to applying 10_gmailfs-py.dpatch in Debian (we package
python-libgmail as a library),
> import sys,traceback,re,string,time,tempfile,array,logging,logging.handlers
>
> @@ -159,13 +159,22 @@
> self.password = password
>
> References={}
> -GmailConfig("/etc/gmailfs/gmailfs.conf")
> +GmailConfig("/etc/gmailfs.conf")
This too is due to applying 10_gmailfs-py.dpatch (we put conf. files
under /etc/gmailfs in case some more config files are needed in a near
future).
> try:
> libgmail.ConfigLogs(log)
> except:
> pass
>
>
> +# This ensures backwards compatability where
> +# old filesystems were stored with 7bit encodings
> +# but new ones are all quoted printable
> +def fixQuotedPrintable(body):
> + fixed = body
> + if re.search("Content-Transfer-Encoding: quoted",body):
> + fixed = quopri.decodestring(body)
> + return fixed
> +
Related to #1.
>
> def _getMessagesByQuery(ga,queryString):
> tries = 0
> @@ -238,6 +247,7 @@
> self.msg = msg
> m = re.match(VersionTag+'=(.*) '+RefInodeTag+'=(.*)
> '+FsNameTag+'='+MagicStartDelim+'(.*)'+MagicEndDelim,msg.subject)
> matchInode = m.group(2)
> +
> log.debug("trying to get inode with:"+matchInode+" from
> subject:"+msg.subject)
> self.inode_msg = self.getinodeMsg(matchInode)
> self.setInode()
> @@ -262,7 +272,7 @@
> if not thread._messages:
> thread._messages = thread._getMessages(thread)
>
> - return thread._messages[0]
> + return thread._messages[len(thread._messages)-1]
Related to #2
> [EMAIL PROTECTED]:getinodeMsg
>
> def update(self):
> @@ -287,8 +297,9 @@
> gmsg = libgmail.GmailComposedMessage(username, subject, body)
> if _sendMessage(self.ga,gmsg):
> log.debug("Sent "+subject+" ok")
> - log.debug("trashing old inode:"+str(self.inode_msg.subject))
> - self.ga.trashMessage(self.inode_msg)
> + if (self.inode_msg):
> + log.debug("trashing old inode:"+str(self.inode_msg.subject))
> + self.ga.trashMessage(self.inode_msg)
Related to #2.
> self.inode_msg = self.getinodeMsg(str(self.ino))
> else:
> e = OSError("Couldnt send mesg:"+gmsg.subject)
> @@ -304,6 +315,7 @@
> try:
> subject = self.inode_msg.subject
> body = self.inode_msg.source
> + body = fixQuotedPrintable(body)
Related to #1
> log.debug("setting inode from subject:"+subject)
> log.debug("and body:"+body)
> m = re.match(VersionTag+'=(.*) '+InodeTag+'=(.*) '+DevTag+'=(.*)
> '+NumberLinksTag+'=(.*) '+FsNameTag+'='+MagicStartDelim+'(.*)'+
> @@ -312,10 +324,16 @@
> self.ino = int(m.group(2))
> self.dev = int(m.group(3))
> self.nlink = int(m.group(4))
> - m = re.search(ModeTag+'=(.*) '+UidTag+'=(.*) '+GidTag+'=(.*) '+
> - SizeTag+'=(.*) '+AtimeTag+'=(.*) '+MtimeTag+'=(.*)
> '+
> - CtimeTag+'=(.*) '+BlockSizeTag+'=(.*)', body)
> - self.mode = int(m.group(1))
> + #quotedEquals = "=(?:3D)?(.*)"
> + quotedEquals = "=(.*)"
> + m = re.search(ModeTag+quotedEquals+' '+UidTag+quotedEquals+' '+
> + GidTag+quotedEquals+' '+
> + SizeTag+quotedEquals+' '+
> + AtimeTag+quotedEquals+' '+
> + MtimeTag+quotedEquals+' '+
> + CtimeTag+quotedEquals+' '+
> + BlockSizeTag+quotedEquals, body)
> + self.mode = int(m.group(1))
This doesn't relate to our bug, but is rather a factoring of the
"=(.*)" string into the quotedEquals variable.
> self.uid = int(m.group(2))
> self.gid = int(m.group(3))
> self.size = int(m.group(4))
> @@ -498,7 +516,7 @@
> thread = folder._threads[0]
> if not thread._messages:
> thread._messages = thread._getMessages(thread)
> - msg = thread._messages[0]
> + msg = thread._messages[len(thread._messages)-1]
Related to #2.
> log.debug("got msg with subject:"+msg.subject)
> log.debug("got "+str(len(msg.attachments))+" attachments")
> a = msg.attachments[0]
> @@ -656,8 +674,9 @@
> e.errno = EINVAL
> raise e
> log.debug("about to follow link in body:"+inode.msg.source)
> + body = fixQuotedPrintable(inode.msg.source)
> m = re.search(LinkToTag+'='+LinkStartDelim+'(.*)'+
> - LinkEndDelim,inode.msg.source)
> + LinkEndDelim,body)
Related to #1: do the regex search on the previously quoted body.
> return m.group(1)
> [EMAIL PROTECTED]:readlink
>
> @@ -690,8 +709,9 @@
> else:
> # Filename was too long, have to fetch message.
> log.debug("Long filename, had to fetch message")
> + body = fixQuotedPrintable(msg.source)
> m = re.search(FileNameTag+'='+FileStartDelim+'(.*)'+
> - FileEndDelim, msg.source)
> + FileEndDelim, body)
Same as above.
> filename = m.group(1)
>
> log.debug("Found file:"+filename)
> @@ -784,10 +804,11 @@
> subject = ( VersionTag+"="+GMAILFS_VERSION+
> " "+RefInodeTag+"="+m.group(2)+
> " "+FsNameTag+"="+MagicStartDelim+ fsNameVar +MagicEndDelim )
> + bodytmp = fixQuotedPrintable(msg.source)
> m = re.search(FileNameTag+'='+FileStartDelim+'(.*)'+FileEndDelim+
> ' '+PathNameTag+'='+PathStartDelim+'(.*)'+PathEndDelim+
> ' '+LinkToTag+'='+LinkStartDelim+'(.*)'+LinkEndDelim,
> - msg.source)
> + bodytmp)
Same as above.
> body = (FileNameTag+"="+FileStartDelim+ name +FileEndDelim+
> " "+PathNameTag+"="+PathStartDelim+ fspath +PathEndDelim+
> " "+LinkToTag+"="+LinkStartDelim+ m.group(3) +LinkEndDelim )
> @@ -1041,6 +1062,7 @@
> [EMAIL PROTECTED]:fsync
>
>
> +
> def getinodemsg(self, path):
> try:
> log.debug("check getnodemsg:"+path)
> @@ -1056,6 +1078,7 @@
> FileStartDelim+name+FileEndDelim+
> ' '+PathNameTag+'='+PathStartDelim+
> fspath +PathEndDelim)
> +
> if len(folder)!=1:
> return None;
> if len(folder._threads[0])!=1:
> @@ -1063,7 +1086,7 @@
> thread = folder._threads[0]
> if not thread._messages:
> thread._messages = thread._getMessages(thread)
> - return thread._messages[0]
> + return thread._messages[len(thread._messages)-1]
Related to #2.
> except:
> traceback.print_exc(file=sys.stdout)
> log.error("no slash in path:"+path)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
