@@ -1,4 +1,30 @@

 -------------------------------------------------------------------

+Mon Feb 23 00:16:31 UTC 2015 - malcolmlewis@opensuse.org

+

+- Update to version 1.0.5:

+  * Fixed a bug in actions where floating point values weren't

+    getting handled correctly. Could cause puddletag to lock up.

+- Changes from 1.0.4:

+  * Fixed regular expression parsing.

+  * Fixed discogs API no longer working. Fixed it so that searches

+    can be done using Discogs release id only.

+  * Fixed comparison of boolean values in format strings.

+  * Fixed scripting function escaping wasn't working.

+  * Changed all config options are stored as JSON. Should fix

+    issues with not being able to store certain values.

+  * Added $to_num scripting function. Converts text to numbers for

+    easy comparison.

+  * Added AIFF support.

+  * Added configuration is stored using XDG dirs. Settings are in

+    ~/.config/puddletag and ~/.local/share/puddletag.

+- Changes from 1.0.3:

+  * Fixed placeholder causing puddletag to not start up for

+    Qt < 4.7.

+  * Fixed new version of configobj library not saving unicode

+    objects.

+  * Fixed __num_images count for mp3 and ogg.

+

+-------------------------------------------------------------------

 Thu Jan 23 17:59:06 UTC 2014 - pascal.bleser@opensuse.org

 - update to 1.0.2:

​

@@ -1,4 +1,4 @@

-# Copyright (c) 2012 Pascal Bleser <pascal.bleser@opensuse.org>

+# Copyright (c) 2012-1015 Pascal Bleser <pascal.bleser@opensuse.org>

 #

 # All modifications and additions to the file contributed by third parties

 # remain the property of their copyright owners, unless otherwise agreed

@@ -16,7 +16,7 @@

 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}

 Name:           puddletag

-Version:        1.0.2

+Version:        1.0.5

 Release:        0.pm.1

 Summary:        Audio Tag Editor

 Source:         http://prdownloads.sourceforge.net/puddletag/puddletag-%{version}.tar.gz

​

@@ -1,3 +1,28 @@

+15 November 2014 - 1.0.5

+   Fixed:

+   A bug in actions where floating point values weren't getting handled correctly. Could cause puddletag to lock up.

+   

+

+9 November 2014 - 1.0.4

+   Fixed:

+   Regular expression parsing

+   Discogs API no longer working. Fixed it so that searches can be done using Discogs release id only.

+   Fixed comparison of boolean values in format strings.

+   Scripting function escaping wasn't working.

+   Changes:

+        All config options are stored as JSON. Should fix issues with not being able to store certain values.

+   Added:

+   $to_num scripting function. Converts text to numbers for easy comparison.

+   AIFF support.

+   Configuration is stored using XDG dirs. Settings are in ~/.config/puddletag and ~/.local/share/puddletag

+   

+

+11 March 2014 - 1.0.3

+   Fixed: 

+         Placeholder causing puddletag to not start up for Qt < 4.7.

+         New version of configobj library not saving unicode objects.

+         __num_images count for mp3 and ogg.

+

 7 November 2013 - 1.0.2

   Fixed:

    Escaped chars in functions weren't being escaped correctly. Check your functions if they make use of this odd behaviour.

​

@@ -1,6 +1,6 @@

 Metadata-Version: 1.1

 Name: puddletag

-Version: 1.0.2

+Version: 1.0.5

 Summary: An simple, powerful audio tag editor.

 Home-page: http://puddletag.sourceforge.net

 Author: concentricpuddle

​

@@ -1,4 +1,10 @@

-7 November 2014 - 1.0.2

+11 March 2014 - 1.0.3

+    Fixed: Placeholder causing puddletag to not start up for Qt < 4.7.

+    Fixed: New version of configobj library not saving unicode objects.

+    Fixed: __num_images count for mp3 and ogg.

+    

+   

+7 November 2013 - 1.0.2

     Fixed: Escaped chars in functions weren't being escaped correctly. Check your functions if they make use of this odd behaviour.

     Added: Opus support.

     Added: Artwork windows list JPG + PNG's at the same time.

​

@@ -1,8 +1,8 @@

 # -*- coding: utf-8 -*-

 import subprocess

 from os.path import dirname

-version_string = '1.0.2'

-version = (1, 0, 2)

+version_string = '1.0.5'

+version = (1, 0, 5)

 try:

     filedir = dirname(dirname(dirname(__file__)))

​

@@ -2,7 +2,7 @@

 from PyQt4.QtGui import *

 from PyQt4.QtCore import *

-from PyQt4 import QtGui, QtCore

+from PyQt4 import QtGui

 import sys, findfunc, pdb, os, resource, string, functions

 from copy import copy, deepcopy

 from pyparsing import delimitedList, alphanums, Combine, Word, ZeroOrMore, \

@@ -15,7 +15,7 @@

 from audioinfo import INFOTAGS, READONLY, usertags, isempty

 from functools import partial

 from constants import (TEXT, COMBO, CHECKBOX, SEPARATOR, 

-    SAVEDIR, ACTIONDIR, BLANK)

+    SAVEDIR, CONFIGDIR, ACTIONDIR, BLANK)

 from util import (open_resourcefile, PluginFunction, escape_html,

     translate, pprint_tag)

 import functions_dialogs

@@ -23,7 +23,7 @@

 from puddletag import status

 READONLY = list(READONLY)

-FUNC_SETTINGS = os.path.join(SAVEDIR, 'function_settings')

+FUNC_SETTINGS = os.path.join(CONFIGDIR, 'function_settings')

 FIELDS_TOOLTIP = translate('Functions Dialog',

     """<p>Fields that will

​

@@ -4,9 +4,17 @@

 from functools import partial

 import mutagen, mutagen.id3 as id3, mutagen.mp3

+

+try:

+    from mutagen.aiff import AIFF, _IFFID3

+except ImportError:

+    AIFF = None

+

 from mutagen.id3 import (APIC, PairedTextFrame, TextFrame, TimeStampTextFrame,

     UrlFrame)

+

+

 import util

 from _compatid3 import CompatID3

@@ -688,328 +696,354 @@

         mutagen.mp3.MP3.add_tags(self, ID3)

     def load(self, filename, ID3=ID3, **kwargs):

-        mutagen.mp3.MP3.load(self, filename, ID3, **kwargs)

+        return mutagen.mp3.MP3.load(self, filename, ID3, **kwargs)

+if AIFF is not None:

+    class AIFFFileType(AIFF):

+        """See ID3 class."""

+        def add_tags(self, ID3=_IFFID3):

+            AIFF.add_tags(self)

-class Tag(TagBase):

-    IMAGETAGS = (util.MIMETYPE, util.DESCRIPTION, util.DATA,

-        util.IMAGETYPE)

-    mapping = {}

-    revmapping = {}

+        def load(self, filename, **kwargs):

+            return AIFF.load(self, filename, **kwargs)

-    def __init__(self, filename=None):

-        self.__images = 

+def tag_factory(id3_filetype):

+    class Tag(TagBase):

+        IMAGETAGS = (util.MIMETYPE, util.DESCRIPTION, util.DATA,

+            util.IMAGETYPE)

+        mapping = {}

+        revmapping = {}

-        self.__tags = CaselessDict() #Used as storage.

-        #Each key as the is the field as used by puddletag, eg. 'artist'

-        #Each value contains an mutagen.id3.Frame object

-        #that have two methods, get_value and set_value.

-        #get_value returns the value stored by the frame as

-        #text/unicode list.

-        #set_value should take text/unicode list in parse it into

-        #it understands.

+        def __init__(self, filename=None):

+            self.__images = 

-        #When saving the frame stored will be used. If it has a 'frames'

-        #attributes, those frames will be used instead.

+            self.__tags = CaselessDict() #Used as storage.

+            #Each key as the is the field as used by puddletag, eg. 'artist'

+            #Each value contains an mutagen.id3.Frame object

+            #that have two methods, get_value and set_value.

+            #get_value returns the value stored by the frame as

+            #text/unicode list.

+            #set_value should take text/unicode list in parse it into

+            #it understands.

-        util.MockTag.__init__(self, filename)

+            #When saving the frame stored will be used. If it has a 'frames'

+            #attributes, those frames will be used instead.

-    def get_filepath(self):

-        return util.MockTag.get_filepath(self)

+            util.MockTag.__init__(self, filename)

-    def set_filepath(self,  val):

-        self.__tags.update(util.MockTag.set_filepath(self, val))

+        def get_filepath(self):

+            return util.MockTag.get_filepath(self)

-    filepath = property(get_filepath, set_filepath)

+        def set_filepath(self,  val):

+            self.__tags.update(util.MockTag.set_filepath(self, val))

-    def _get_images(self):

-        return self.__images

+        filepath = property(get_filepath, set_filepath)

-    def _set_images(self, images):

-        if images:

-            self.__images = map(lambda i: parse_image(i, self.IMAGETAGS),

-                images)

-        else:

-            self.__images = 

-        cover_info(images, self.__tags)

+        def _get_images(self):

+            return self.__images

-    images = property(_get_images, _set_images)

+        def _set_images(self, images):

+            if images:

+                self.__images = map(lambda i: parse_image(i, self.IMAGETAGS),

+                    images)

+            else:

+                self.__images = 

+            cover_info(images, self.__tags)

-    def _info(self):

-        info = self.mut_obj.info

-        fileinfo = ('Path', selfPATH),

-                    ('Size', str_filesize(int(self.size))),

-                    ('Filename', selfFILENAME),

-                    ('Modified', self.modified)

-        try:

-            version = self.mut_obj.tags.version

-            version = ('ID3 Version', self.filetype)

-        except AttributeError:

-            version = ('ID3 Version', 'No tags in file.')

-        fileinfo.append(version)

+        images = property(_get_images, _set_images)

-        mpginfo = ('Version', u'MPEG %i Layer %i' % (info.version, info.layer)),

-                   ('Bitrate', self.bitrate),

-                   ('Frequency', self.frequency),

-                   ('Mode', MODESinfo.mode),

-                   ('Length', self.length)

+        def _info(self):

+            info = self.mut_obj.info

+            fileinfo = ('Path', selfPATH),

+                        ('Size', str_filesize(int(self.size))),

+                        ('Filename', selfFILENAME),

+                        ('Modified', self.modified)

+            try:

+                version = self.mut_obj.tags.version

+                version = ('ID3 Version', self.filetype)

+            except AttributeError:

+                version = ('ID3 Version', 'No tags in file.')

+            fileinfo.append(version)

-        return ('File', fileinfo), (mpginfo00, mpginfo)

+            mpginfo = ('Version', u'MPEG %i Layer %i' % (info.version, info.layer)),

+                       ('Bitrate', self.bitrate),

+                       ('Frequency', self.frequency),

+                       ('Mode', MODESinfo.mode),

+                       ('Length', self.length)

-    info = property(_info)

+            return ('File', fileinfo), (mpginfo00, mpginfo)

-    def __contains__(self, key):

-        if key == '__image':

-            return bool(self.images)

+        info = property(_info)

-        elif key == '__total':

-            try:

-                return bool(get_total(self))

-            except (KeyError, ValueError):

-                return False

-

-        if self.revmapping:

-            key = self.revmapping.get(key, key)

-        

-        return key in self.__tags

-

-    def __deepcopy__(self, memo=None):

-        cls = Tag()

-        tags = CaselessDict()

-        frames = 

-        frames.append(frame) if not hasattr(frame, 'frames') else

-            frames.extend(frame.frames) for key, frame in self.__tags.items()

-            if not key.startswith('__')

-        funcs = 

-        frames_copy = 

-        for frame in frames:

-            funcs.append((getattr(frame, 'get_value', None),

-                getattr(frame, 'set_value', None)))

-            if hasattr(frame, 'get_value'):

-                delattr(frame, 'get_value')

-            if hasattr(frame, 'set_value'):

-                delattr(frame, 'set_value')

-            frames_copy.append(deepcopy(frame))

-        tags = handle(dict((frame.HashKey, frame) for frame in frames_copy))

-        for frame, (get_value, set_value) in zip(frames, funcs):

-            if get_value is not None:

-                frame.get_value = get_value

-            if set_value is not None:

-                frame.set_value = set_value

-        for key, value in self.__tags.items():

-            if key not in tags:

-                tagskey = deepcopy(value)

-        cls.set_fundamentals(tags,

-            self.mut_obj, deepcopy(self.images))

-        cls.filepath = self.filepath

-        return cls

-

-    @del_deco

-    def __delitem__(self, key):

-        if key == '__image':

-            self.images = 

-        elif key.startswith('__'):

-            return

-        else:

-            del(self.__tagskey)

-

-    @getdeco

-    def __getitem__(self,key):

-        if key.startswith('__'):

+        def __contains__(self, key):

             if key == '__image':

-                return self.images

-            elif key == '__filetype':

-                return self.filetype

+                return bool(self.images)

+

             elif key == '__total':

-                return get_total(self)

+                try:

+                    return bool(get_total(self))

+                except (KeyError, ValueError):

+                    return False

+

+            if self.revmapping:

+                key = self.revmapping.get(key, key)

+

+            return key in self.__tags

+

+        def __deepcopy__(self, memo=None):

+            cls = Tag()

+            tags = CaselessDict()

+            frames = 

+            frames.append(frame) if not hasattr(frame, 'frames') else

+                frames.extend(frame.frames) for key, frame in self.__tags.items()

+                if not key.startswith('__')

+            funcs = 

+            frames_copy = 

+            for frame in frames:

+                funcs.append((getattr(frame, 'get_value', None),

+                    getattr(frame, 'set_value', None)))

+                if hasattr(frame, 'get_value'):

+                    delattr(frame, 'get_value')

+                if hasattr(frame, 'set_value'):

+                    delattr(frame, 'set_value')

+                frames_copy.append(deepcopy(frame))

+            tags = handle(dict((frame.HashKey, frame) for frame in frames_copy))

+            for frame, (get_value, set_value) in zip(frames, funcs):

+                if get_value is not None:

+                    frame.get_value = get_value

+                if set_value is not None:

+                    frame.set_value = set_value

+            for key, value in self.__tags.items():

+                if key not in tags:

+                    tagskey = deepcopy(value)

+            cls.set_fundamentals(tags,

+                self.mut_obj, deepcopy(self.images))

+            cls.filepath = self.filepath

+            return cls

+

+        @del_deco

+        def __delitem__(self, key):

+            if key == '__image':

+                self.images = 

+            elif key.startswith('__'):

+                return

             else:

+                del(self.__tagskey)

+

+        @getdeco

+        def __getitem__(self,key):

+            if key.startswith('__'):

+                if key == '__image':

+                    return self.images

+                elif key == '__filetype':

+                    return self.filetype

+                elif key == '__total':

+                    return get_total(self)

+                else:

+                    return self.__tagskey

+            elif not isinstance(key, basestring):

                 return self.__tagskey

-        elif not isinstance(key, basestring):

-            return self.__tagskey

-        else:

-            return self.__tagskey.get_value()

-

-    @setdeco

-    def __setitem__(self, key, value):

-        if not isinstance(key, basestring):

-            self.__tagskey = value

-            return

-        if key.startswith('__'):

-            if key == '__image':

-                self.images = value

-            elif key in fn_hash:

-                setattr(self, fn_hashkey, value)

-            elif key == '__total':

-                set_total(self, value)

-            return

-

-        value = unicode_list(value)

+            else:

+                return self.__tagskey.get_value()

+

+        @setdeco

+        def __setitem__(self, key, value):

+            if not isinstance(key, basestring):

+                self.__tagskey = value

+                return

+            if key.startswith('__'):

+                if key == '__image':

+                    self.images = value

+                elif key in fn_hash:

+                    setattr(self, fn_hashkey, value)

+                elif key == '__total':

+                    set_total(self, value)

+                return

+

+            value = unicode_list(value)

+

+            if isempty(value):

+                if key in self:

+                    del(selfkey)

+                return

+

+            if key in self.__tags:

+                self.__tagskey.set_value(value)

+            else:

+                if key in write_frames:

+                    self.__tags.update(write_frameskey(value))

+                elif key == u'comment':

+                    frame = {'comment': create_comment('', value)'comment:'}

+                    self.__tags.update(frame)

+                elif key.startswith('comment:'):

+                    self.__tags.update(create_comment(keylen('comment:'):, value))

+                elif key.startswith('www:'):

+                    self.__tags.update(create_userurl(key, value))

+                elif key.startswith('ufid:'):

+                    self.__tags.update(create_ufid(key, value))

+                elif key.startswith('rgain:'):

+                    self.__tags.update(create_rgain(key, value))

+                elif key.startswith('unsyncedlyrics:'):

+                    self.__tags.update(create_uslt(key, value))

+                else:

+                    self.__tags.update(create_usertext(key, value))

+

+        def delete(self):

+            self.mut_obj.delete()

+            for key in self.usertags:

+                del(self.__tagsself.revmapping.get(key, key))

+            self.images = 

-        if isempty(value):

-            if key in self:

-                del(selfkey)

-            return

+        @keys_deco

+        def keys(self):

+            return self.__tags.keys()

-        if key in self.__tags:

-            self.__tagskey.set_value(value)

-        else:

-            if key in write_frames:

-                self.__tags.update(write_frameskey(value))

-            elif key == u'comment':

-                frame = {'comment': create_comment('', value)'comment:'}

-                self.__tags.update(frame)

-            elif key.startswith('comment:'):

-                self.__tags.update(create_comment(keylen('comment:'):, value))

-            elif key.startswith('www:'):

-                self.__tags.update(create_userurl(key, value))

-            elif key.startswith('ufid:'):

-                self.__tags.update(create_ufid(key, value))

-            elif key.startswith('rgain:'):

-                self.__tags.update(create_rgain(key, value))

-            elif key.startswith('unsyncedlyrics:'):

-                self.__tags.update(create_uslt(key, value))

+        def link(self, filename):

+            """Links the audio, filename

+            returns self if successful, None otherwise."""

+            self.__images = 

+            tags, audio = self.load(filename, id3_filetype)

+            if audio is None:

+                return

+

+            if audio.tags: #Not empty

+                audio.tags.update_to_v24()

+                self.__tags.update(handle(audio))

+

+                #Get the image data.

+                apics = audio.tags.getall("APIC")

+                if apics:

+                    self.images = map(bin_to_pic, apics)

+                else:

+                    self.images = ;

+

+            self.__tags.update(tags)

+            self.__tags.update(info_to_dict(audio.info))

+

+            if self.ext.lower() == 'mp3':

+                self.__tags'__filetype' = u'MP3'

             else:

-                self.__tags.update(create_usertext(key, value))

-

-    def delete(self):

-        self.mut_obj.delete()

-        for key in self.usertags:

-            del(self.__tagsself.revmapping.get(key, key))

-        self.images = 

-

-    @keys_deco

-    def keys(self):

-        return self.__tags.keys()

-

-    def link(self, filename):

-        """Links the audio, filename

-        returns self if successful, None otherwise."""

-        self.__images = 

-        tags, audio = self.load(filename, ID3FileType)

-        if audio is None:

-            return

-

-        if audio.tags: #Not empty

-            audio.tags.update_to_v24()

-            self.__tags.update(handle(audio))

+                self.__tags'__filetype' = u'ID3'

-            #Get the image data.

-            apics = audio.tags.getall("APIC")

-            if apics:

-                self.images = map(bin_to_pic, apics)

+            self.set_attrs(ATTRIBUTES, self.__tags)

-        self.__tags.update(tags)

-        self.__tags.update(info_to_dict(audio.info))

+            try:

+                self.__tags'__tag_read' = u'ID3v%s.%s' % audio.tags.version:2

+            except AttributeError:

+                self.__tags'__tag_read' = u''

+            self.mut_obj = audio

+            self._originaltags = audio.keys()

+            self.update_tag_list()

+            return self

+

+        def save(self, v1=None, v2=None):

+            if v1 is None:

+                v1 = v1_option

+            """Writes the tags to file."""

+            filename = self.filepath

+            if self.mut_obj.tags is None:

+                self.mut_obj.add_tags()

+            if filename != self.mut_obj.filename:

+                self.mut_obj.tags.filename = filename

+                self.mut_obj.filename = filename

+            audio = self.mut_obj

+            util.MockTag.save(self)

+

+            userkeys = usertags(self.__tags).keys()

+            frames = 

+            frames.append(frame) if not hasattr(frame, 'frames') else

+                frames.extend(frame.frames) for key, frame in self.__tags.items()

+                if key in userkeys

+            hashes = dict((frame.HashKey, frame) for frame in frames)

+            toremove = z for z in self._originaltags if z in audio

+                        and not (z in hashes or z.startswith('APIC'))

+            audio.update(hashes)

+

+            old_apics = z for z in audio if z.startswith(u'APIC')

+            if self.__images:

+                newimages = 

+                for image in filter(None, map(pic_to_bin, self.__images)):

+                    i = 0

+                    while image.HashKey in newimages:

+                        i += 1

+                        #Pad with spaces so that each key is unique.

+                        image.desc += u' '*i

+                    audioimage.HashKey = image

+                    newimages.append(image.HashKey)

+                toremove.append(z) for z in old_apics if z not in newimages

+            else:

+                toremove.extend(old_apics)

+

+            for z in set(toremove):

+                try:

+                    del(audioz)

+                except KeyError:

+                    continue

+

+            audio.tags.filename = self.filepath

+            v1 = v1_option if v1 is None else v1

+            v2 = v2_option if v2 is None else v2

+

+            if AIFF is not None and id3_filetype is AIFFFileType:

+                if v2 == 3:

+                    audio.tags.save(v2_version=3) #AIFF doesn't support id3v1

+                else:

+                    audio.tags.save() #AIFF doesn't support id3v1

+            else:

+                if v2 == 4:

+                    audio.tags.update_to_v24()

+                    audio.tags.save(v1=v1, v2=4)

+                else:

+                    c = ID3()

+                    c.filename = self.filepath

+                    c.update(audio)

+                    c.update_to_v23()

+                    c.save(v1=v1, v2=3)

+

+            self.__tags'__tag_read' = u'ID3v2.4' if v2 == 4 else u'ID3v2.3'

+            self.update_tag_list()

+            self._originaltags = audio.keys()

+

+        def set_fundamentals(self, tags, mut_obj, images=None):

+            self.__tags = tags

+            self.mut_obj = mut_obj

+            if images:

+                self.images = images

+            self._originaltags = tags.keys()

+            self.set_attrs(ATTRIBUTES, tags)

+

+        def to_encoding(self, encoding = UTF8):

+            frames = 

+            saved = 

+            for frame in self.__tags.values():

+                if hasattr(frame, 'encoding'):

+                    frames.append((frame, frame.encoding))

+                    frame.encoding = encoding

+            try:

+                self.save(v2=4)

+            except:

+                for frame, enc in frames:

+                    frame.encoding = enc

+                raise

+

+        def update_tag_list(self):

+            tag = self.__tags'__tag_read'

+            l = tag_versions.tags_in_file(self.filepath)

+            if l:

+                if tag and tag in l:

+                    l.remove(tag)

+                    l.insert(0, tag)

+                self.__tags'__tag' = u', '.join(l)

+            else:

+                self.__tags'__tag' = tag

-        if self.ext.lower() == 'mp3':

-            self.__tags'__filetype' = u'MP3'

-        else:

-            self.__tags'__filetype' = u'ID3'

+    return Tag

-        self.set_attrs(ATTRIBUTES, self.__tags)

-            

-        try:

-            self.__tags'__tag_read' = u'ID3v%s.%s' % audio.tags.version:2

-        except AttributeError:

-            self.__tags'__tag_read' = u''

-        self.mut_obj = audio

-        self._originaltags = audio.keys()

-        self.update_tag_list()

-        return self

-

-    def save(self, v1=None, v2=None):

-        if v1 is None:

-            v1 = v1_option

-        """Writes the tags to file."""

-        filename = self.filepath

-        if self.mut_obj.tags is None:

-            self.mut_obj.add_tags()

-        if filename != self.mut_obj.filename:

-            self.mut_obj.tags.filename = filename

-            self.mut_obj.filename = filename

-        audio = self.mut_obj

-        util.MockTag.save(self)

-

-        userkeys = usertags(self.__tags).keys()

-        frames = 

-        frames.append(frame) if not hasattr(frame, 'frames') else

-            frames.extend(frame.frames) for key, frame in self.__tags.items()

-            if key in userkeys

-        hashes = dict((frame.HashKey, frame) for frame in frames)

-        toremove = z for z in self._originaltags if z in audio

-                    and not (z in hashes or z.startswith('APIC'))

-        audio.update(hashes)

-

-        old_apics = z for z in audio if z.startswith(u'APIC')

-        if self.__images:

-            newimages = 

-            for image in filter(None, map(pic_to_bin, self.__images)):

-                i = 0

-                while image.HashKey in newimages:

-                    i += 1

-                    #Pad with spaces so that each key is unique.

-                    image.desc += u' '*i

-                audioimage.HashKey = image

-                newimages.append(image.HashKey)

-            toremove.append(z) for z in old_apics if z not in newimages

-        else:

-            toremove.extend(old_apics)

+Tag = tag_factory(ID3FileType)    

-        for z in set(toremove):

-            try:

-                del(audioz)

-            except KeyError:

-                continue

-            

-        audio.tags.filename = self.filepath

-        v1 = v1_option if v1 is None else v1

-        v2 = v2_option if v2 is None else v2

-        

-        if v2 == 4:

-            audio.tags.update_to_v24()

-            audio.tags.save(v1=v1, v2=4)

-        else:

-            c = ID3()

-            c.filename = self.filepath

-            c.update(audio)

-            c.update_to_v23()

-            c.save(v1=v1, v2=3)

-

-        self.__tags'__tag_read' = u'ID3v2.4' if v2 == 4 else u'ID3v2.3'

-        self.update_tag_list()

-        self._originaltags = audio.keys()

-

-    def set_fundamentals(self, tags, mut_obj, images=None):

-        self.__tags = tags

-        self.mut_obj = mut_obj

-        if images:

-            self.images = images

-        self._originaltags = tags.keys()

-        self.set_attrs(ATTRIBUTES, tags)

-

-    def to_encoding(self, encoding = UTF8):

-        frames = 

-        saved = 

-        for frame in self.__tags.values():

-            if hasattr(frame, 'encoding'):

-                frames.append((frame, frame.encoding))

-                frame.encoding = encoding

-        try:

-            self.save(v2=4)

-        except:

-            for frame, enc in frames:

-                frame.encoding = enc

-            raise

-

-    def update_tag_list(self):

-        tag = self.__tags'__tag_read'

-        l = tag_versions.tags_in_file(self.filepath)

-        if l:

-            if tag and tag in l:

-                l.remove(tag)

-                l.insert(0, tag)

-            self.__tags'__tag' = u', '.join(l)

-        else:

-            self.__tags'__tag' = tag

+filetypes = 

+    (ID3FileType, tag_factory(ID3FileType), u'ID3', 'mp3'),

+

-filetype = ID3FileType, Tag, u'ID3', 'mp3'

\ No newline at end of file

+if AIFF is not None:

+    filetypes.append((AIFFFileType, tag_factory(AIFFFileType), u'AIFF', 'aiff'))

\ No newline at end of file

​

@@ -323,7 +323,7 @@

         self.revmapping, self.mapping = {}, {}

         self.__freeform = {} #Keys are tags as required by mutagen i.e. The '----'

-                            #frames. Values are the tag as represented by puddletag.

+                             #frames. Values are the tag as represented by puddletag.

         if audio.tags: #Not empty

             keys = audio.keys()

@@ -413,7 +413,6 @@

         tags = (z, tagsz) for z in tags

             if z not in 'track', 'totaltracks', 'disc', 'totaldiscs'

-        x = self.__tags

         for tag, value in tags:

             try:

                 newtagREVTAGStag = value

​

@@ -266,7 +266,9 @@

     """

     attrs = dir(info)

     tags = {}

-    try: tags"__frequency" = strfrequency(info.sample_rate)

+    try: 

+        tags"__frequency" = strfrequency(info.sample_rate)

+        tags"__frequency_num" = info.sample_rate / 1000.0

     except AttributeError: pass

     try: tags"__length" = strlength(info.length)

@@ -275,8 +277,12 @@

     try: tags"__length_seconds" = unicode(int(info.length))

     except AttributeError: pass

-    try: tags"__bitrate" = strbitrate(info.bitrate)

-    except AttributeError: tagsu"__bitrate" = u'0 kb/s'

+    try: 

+        tags"__bitrate" = strbitrate(info.bitrate)

+        tags"__bitrate_num" = unicode(int(info.bitrate / 1000))

+    except AttributeError: 

+        tagsu"__bitrate" = u'0 kb/s'

+        tags"__bitrate_num" = 0

     try: tags'__bitspersample' = unicode(info.bits_per_sample)

     except AttributeError: pass

​

@@ -8,7 +8,6 @@

 except ImportError:

     OggOpus = None

-import mutagen.flac

 from mutagen.flac import Picture, FLAC

 import base64

@@ -181,6 +180,8 @@

             if base == FLAC:

                 self.images = filter(None, map(bin_to_image, audio.pictures))

+            elif not self.images:

+                self.images = 

             self.__tags.update(info_to_dict(audio.info))

             self.__tags.update(tags)

@@ -227,6 +228,8 @@

             self.mut_obj = mut_obj

             if images:

                 self.images = images

+            else:

+                self.images = 

             self._originaltags = tags.keys()

         def update_tag_list(self):

​

@@ -1,5 +1,5 @@

 # -*- coding: utf-8 -*-

-from puddlestuff.constants import SAVEDIR

+from puddlestuff.constants import CONFIGDIR

 from puddlestuff.puddleobjects import PuddleConfig

 from puddlestuff.translations import translate

 import os

@@ -11,7 +11,7 @@

 SECTION = 'Config'

 VALUE = 'value'

-_filename = os.path.join(SAVEDIR, 'confirmations')

+_filename = os.path.join(CONFIGDIR, 'confirmations')

 _confirmations = {}

 _registered = 

​

@@ -1,7 +1,6 @@

 # -*- coding: utf-8 -*-

 import os, sys

 from PyQt4.QtCore import Qt, SIGNAL

-from PyQt4.QtGui import QWidget, QApplication

 from os.path import dirname, join

 from puddlestuff.translations import translate

@@ -40,13 +39,22 @@

 FS_ENC = sys.getfilesystemencoding()

 #Paths

-HOMEDIR = os.getenv('HOME')

-SAVEDIR = join(HOMEDIR,'.puddletag')

-CONFIG = join(SAVEDIR, 'puddletag.conf')

-QT_CONFIG = join(SAVEDIR, 'qt.conf')

-PLUGINDIR = join(SAVEDIR, 'plugins')

+

 PROGDIR = dirname(dirname(__file__))

 DATADIR = join(dirname(__file__), 'data')

+

+_config_dir = os.environ.get('XDG_CONFIG_HOME', os.path.join(os.path.expanduser("~"), '.config'))

+CONFIGDIR = os.path.join(_config_dir, 'puddletag')

+HOMEDIR = os.path.expanduser('~')

+

+CONFIG = join(CONFIGDIR, 'puddletag.conf')

+QT_CONFIG = join(CONFIGDIR, 'qt.conf')

+

+_data_dir = os.environ.get('XDG_DATA_HOME', os.path.join(os.path.expanduser("~"), '.local/share'))

+

+SAVEDIR = os.path.join(_data_dir, 'puddletag')

+PLUGINDIR = join(SAVEDIR, 'plugins')

+

 ACTIONDIR = join(SAVEDIR, 'actions')

 TRANSDIR = join(SAVEDIR, 'translations')

​

@@ -1,35 +1,176 @@

-info

-version=29

-

-menu

-&File=&Open Folder,&Add Folder,separator,Load &playlist,Sa&ve playlist,separator,&Save,&Play,separator,&Delete,Delete &Without Confirmation,separator,&Refresh,Refresh &Selected,&Unload Everything,separator,&Exit

-&Edit=&Undo,E&xtended Tags,&Properties,separator,&Cut,&Copy Selection,Copy All &Fields,&Paste,Paste &Onto Selection,separator,&Remove Tag,separator,Select &Next Directory,Select &Previous Directory,&Invert Selection,&Select Column,Select &All,separator,Move Selected &Up,Move Selected Do&wn,separator,&Increase Font,&Decrease Font,separator,&Preferences

-&Convert=&File->Tag,&Tag->File,&Format,separator,&Rename Directories,&Text File->Tag,&Clipboard->Tag

-&Actions=&Actions,&QuickActions,&Functions,separator

-&Tools=Autonumbering &Wizard...,&Import Music Library...,Replace...,Sort &By

-&Preview Mode=Enabl&e Preview Mode,&Undo Last Clear,&Write Previews,Clear Selected &Files, Clear Selected &Cells

-Ta&g Tools=Remove &APEv2 Tag,Remove All &ID3 Tags,Remove ID3v&2 Tag,Remove ID3v&1 Tag

-&Windows=Filter,Tag Panel,Artwork,Filesystem,Tag Sources,Stored Tags,Music Library,Logs,Puddle Testing,Mass Tagging,separator,Functions,Actions #,separator,&Lock Layout

-#Ab&out=About &Qt,

-

-menuattrs

-order=&File,&Edit,&Convert,&Actions,&Tools,&Preview Mode,Ta&g Tools,&Windows

-

-toolbar

-&File=&Open Folder,&Add Folder,&Refresh

-&Edit=&Save,&Undo

-&Convert=widget-patterncombo,&File->Tag,&Tag->File,&Format,&Rename Directories

-&Action=&Actions,&QuickActions,&Functions

-&Tools=Autonumbering &Wizard...,&Text File->Tag,Field &Sort

-

-toolbarattrs

-order=&File,&Edit,&Convert,&Action,&Tools

-

-table

-order=Sort &By,separator,&Play,E&xtended Tags,&Remove Tag,separator,&Cut,&Copy Selection,Copy All &Fields,&Paste,Paste &Onto Selection,separator,&Delete,separator,&Properties

-

-winshortcuts

-Filter=F3

-

-shortcuts

-"__dirpath/album/track"=Alt+Meta+1

\ No newline at end of file

+{

+  "info": {

+    "version": "29"

+  }, 

+  "shortcuts": {

+    "__dirpath/album/track": "Alt+Meta+1"

+  }, 

+  "menu": {

+    "&File": 

+      "&Open Folder", 

+      "&Add Folder", 

+      "separator", 

+      "Load &playlist", 

+      "Sa&ve playlist", 

+      "separator", 

+      "&Save", 

+      "&Play", 

+      "separator", 

+      "&Delete", 

+      "Delete &Without Confirmation", 

+      "separator", 

+      "&Refresh", 

+      "Refresh &Selected", 

+      "&Unload Everything", 

+      "separator", 

+      "&Exit"

+    , 

+    "&Edit": 

+      "&Undo", 

+      "E&xtended Tags", 

+      "&Properties", 

+      "separator", 

+      "&Cut", 

+      "&Copy Selection", 

+      "Copy All &Fields", 

+      "&Paste", 

+      "Paste &Onto Selection", 

+      "separator", 

+      "&Remove Tag", 

+      "separator", 

+      "Select &Next Directory", 

+      "Select &Previous Directory", 

+      "&Invert Selection", 

+      "&Select Column", 

+      "Select &All", 

+      "separator", 

+      "Move Selected &Up", 

+      "Move Selected Do&wn", 

+      "separator", 

+      "&Increase Font", 

+      "&Decrease Font", 

+      "separator", 

+      "&Preferences"

+    , 

+    "&Convert": 

+      "&File->Tag", 

+      "&Tag->File", 

+      "&Format", 

+      "separator", 

+      "&Rename Directories", 

+      "&Text File->Tag", 

+      "&Clipboard->Tag"

+    , 

+    "&Actions": 

+      "&Actions", 

+      "&QuickActions", 

+      "&Functions", 

+      "separator"

+    , 

+    "&Tools": 

+      "Autonumbering &Wizard...", 

+      "&Import Music Library...", 

+      "Replace...", 

+      "Sort &By"

+    , 

+    "&Preview Mode": 

+      "Enabl&e Preview Mode", 

+      "&Undo Last Clear", 

+      "&Write Previews", 

+      "Clear Selected &Files", 

+      "Clear Selected &Cells"

+    , 

+    "Ta&g Tools": 

+      "Remove &APEv2 Tag", 

+      "Remove All &ID3 Tags", 

+      "Remove ID3v&2 Tag", 

+      "Remove ID3v&1 Tag"

+    , 

+    "&Windows": 

+      "Filter", 

+      "Tag Panel", 

+      "Artwork", 

+      "Filesystem", 

+      "Tag Sources", 

+      "Stored Tags", 

+      "Music Library", 

+      "Logs", 

+      "Puddle Testing", 

+      "Mass Tagging", 

+      "separator", 

+      "Functions", 

+      "Actions"

+    

+  }, 

+  "winshortcuts": {

+    "Filter": "F3"

+  }, 

+  "table": {

+    "order": 

+      "Sort &By", 

+      "separator", 

+      "&Play", 

+      "E&xtended Tags", 

+      "&Remove Tag", 

+      "separator", 

+      "&Cut", 

+      "&Copy Selection", 

+      "Copy All &Fields", 

+      "&Paste", 

+      "Paste &Onto Selection", 

+      "separator", 

+      "&Delete", 

+      "separator", 

+      "&Properties"

+    

+  }, 

+  "menuattrs": {

+    "order": 

+      "&File", 

+      "&Edit", 

+      "&Convert", 

+      "&Actions", 

+      "&Tools", 

+      "&Preview Mode", 

+      "Ta&g Tools", 

+      "&Windows"

+    

+  }, 

+  "toolbarattrs": {

+    "order": 

+      "&File", 

+      "&Edit", 

+      "&Convert", 

+      "&Action", 

+      "&Tools"

+    

+  }, 

+  "toolbar": {

+    "&File": 

+      "&Open Folder", 

+      "&Add Folder", 

+      "&Refresh"

+    , 

+    "&Edit": 

+      "&Save", 

+      "&Undo"

+    , 

+    "&Convert": 

+      "widget-patterncombo", 

+      "&File->Tag", 

+      "&Tag->File", 

+      "&Format", 

+      "&Rename Directories"

+    , 

+    "&Action": 

+      "&Actions", 

+      "&QuickActions", 

+      "&Functions"

+    , 

+    "&Tools": 

+      "Autonumbering &Wizard...", 

+      "&Text File->Tag", 

+      "Field &Sort"

+    

+  }

+}

\ No newline at end of file

​

@@ -1,375 +1,381 @@

-info

-version=29

-

-shortcut1

-name=&Open Folder

-icon=:/open.png

-control=mainwin

-command=openDir

-enabled=always

-tooltip=Select a directory to import into puddletag.

-shortcut=Ctrl+O

-icon_name=folder

-

-shortcut2

-name=&Add Folder

-icon=:/addfolder.png

-control=mainwin

-command=appendDir

-enabled=filesloaded

-tooltip=Append a directory to current file-view.

-icon_name=folder-new

-

-shortcut3

-name=Load &playlist

-icon=:/playlist.png

-control=mainwin

-command=loadPlayList

-enabled=always

-tooltip=Import an m3u playlist into puddletag.

-icon_name=view-media-playlist

-

-shortcut4

-name=Sa&ve playlist

-control=mainwin

-command=savePlayList

-enabled=viewfilled

-tooltip=Save all files to m3u playlist.

-

-shortcut5

-name=&Refresh

-control=table

-command=reloadFiles

-shortcut=F5

-tooltip=Refresh current file-view.

-icon=:/reload.png

-enabled=filesloaded

-icon_name=view-refresh