Added audio tags read support.

Also, clean up setup things and imports.

.gitignore

@@ -5,4 +5,4 @@ __pycache__/
 tags
 MANIFEST
 .cache
-pygtktalog.egg-info
+pycatalog.egg-info

MANIFEST.in

@@ -1,4 +0,0 @@
-include setup.py
-include pavement.py
-include paver-minilib.zip
-include pygtktalog/locale/*/*/*.mo

README.rst

@@ -1,131 +1,75 @@
-pyGTKtalog
+pycatalog
 ==========
 
-Pygtktalog is Linux/FreeBSD program for indexing CD, DVD, BR or directories on
-filesystem. It is similar to `gtktalog`_ or `gwhere`_. There is no coincidence
-in name of application, because it's meant to be replacement (in some way) for
-gtktalog, which seems to be dead project for years.
+Pycatalog is a commandline Linux/FreeBSD program for indexing CD, DVD, BR or
+directories on filesystem. It is similar to `gtktalog`_ or `gwhere`_. There is
+no coincidence in name of application, because it's meant to be replacement
+(in some way) for gtktalog, which seems to be dead project for years.
 
-Current version is 2.0.
+Note, that even if it share same code base with pyGTKtalog, which was meant to
+be desktop application, now pycatalog is pure console app, just for use with
+commandline. You can find last version of pyGTKtalog under ``pyGTKtalog``
+branch, although bear in mind, that it was written with `python 2.7`_ and
+pyGTK_, which both are dead now.
 
-FEATURES
+Current version is 3.0.
+
+Features
 --------
 
 * Scan for files in selected media
 * Support for grouping files depending on file name (expected patterns in file
   names)
-* Get/generate thumbnails from EXIF and other images
 * Store selected EXIF tags
 * Add/edit description and notes
 * Fetch comments for images made in `gThumb`_
-* Add/remove unlimited images to any file or directory
 * `Tagging files`_
 * And more :)
 
-Frontends
----------
-
-New version of pyGTKtalog was meant to use multiple interfaces.
-
-#. First for the new incarnation of pyGTKtalog is… command line tool for
-   accessing catalog dbs. With ``cmdcatalog.py`` it's possible to:
-
-   * create new catalog
-   * update it
-   * list
-   * find files
-   * fsck (for maintenance for orphaned thumbs/images)
-
-#. ``gtktalog.py``. This is written from scratch frontend in pygtk. Still work
-   in progress.
-
 Requirements
 ------------
 
-pyGTKtalog requires python and following libraries:
+pycatalog requires python and following libraries:
 
-* `python 3`_, tested on python 3.6
-* `sqlalchemy 1.2`_ or higher
-* `pygtk 2.24`_ (only for ``gtktalog.py``, will not work with python3)
-* `pillow`_ for image manipulation
+* `python 3.10`_ and up
+* `sqlalchemy 1.4`_
 * `exifread`_ for parse EXIF information
+* `mutagen`_ for extracting tags from audio files
 
-It may work on other (lower) version of libraries, and it should work with
-higher versions of libraries. GTK3 support will follow.
-
-pyGTKtalog extensively uses external programs in unix spirit, however there is
+Pycatalog extensively uses external programs in unix spirit, however there is
 small possibility of using it Windows (probably with limitations) and quite big
 possibility to run it on other sophisticated unix-like systems (i.e.
 BeOS/ZETA/Haiku, QNX or MacOSX).
 
 Programs that are used:
-* ``mencoder`` (provided by `mplayer`_ package)
-* ``montage``, ``convert`` from `ImageMagick`_
+* ``midentify`` (provided by `mplayer`_ package)
 
 For development process following programs are used:
 
-* `gettext`_
-* `intltool`_
 * `nose`_
 * `coverage`_
-* `paver`_
 * `tox`_
 
-INSTALATION
+Instalation
 -----------
 
 You don't have to install it if you don't want to. You can just change current
-directory to pyGTKtalog and simply run::
+directory to pycatalog and simply run::
 
     $ paver run
 
 That's it. Alternatively, if you like to put it in more system wide place, all
 you have to do is:
 
-#. put pyGTKtalog directory into your destination of choice (/usr/local/share,
+#. put pycatalog directory into your destination of choice (/usr/local/share,
    /opt or ~/ is typical bet)
 
-#. copy pyGTKtalog shell script to /usr/bin, /usr/local/bin or in
+#. copy pycatalog shell script to /usr/bin, /usr/local/bin or in
    other place, where PATH variable is pointing or you feel like.
 
-#. then modify pyGTKtalog line 6 to match right ``pygtktalog.py`` directory
+#. then modify pycatalog line 6 to match right ``pycatalog.py`` directory
 
-Then, just run pyGTKtalog script.
-
-Technical details
------------------
-
-Catalog file is plain sqlite database (optionally compressed with bzip2). All
-images are stored in location pointed by db entry in ``config`` table - it is
-assumed, that images directory will be placed within the root directory, where
-the main db lies.
-Generated sha512 hash from image file itself. There is small possibility for two
-identical hash for different image files. However, no images are overwritten.
-Thumbnail filename for each image is simply concatenation of image filename in
-images directory and '_t' string.
-
-There is also converter from old database to new for internal use only. In
-public release there will be no other formats so it will be useless, and
-deleted. There are some issues with converting. All thumbnails will be lost.
-All images without big image will be lost. There are serious changes with
-application design, and I decided, that is better to keep media unpacked on
-disk, instead of pack it every time with save and unpack with open methods. New
-design prevent from deleting any file from media directory (placed in
-``~/.pygtktalog/images``). Functionality for exporting images and corresponding
-db file is planned.
-
-
-DEVELOPMENT
------------
-
-Several tools has been used to develop pyGTKtalog.
-
-Paver
-^^^^^
-
-I've choose `Paver`_ as make equivalent. Inside main project directory there is
-``pavement.py`` script, which provides several tasks, that can be helpful in a work
-with sources. Paver is also used to generate standard ``setup.py``.
+Then, just run pycatalog script.
 
 LICENSE
 =======
@@ -136,18 +80,13 @@ file in top-level directory.
 
 .. _coverage: http://nedbatchelder.com/code/coverage/
 .. _exifread: https://github.com/ianare/exif-py
-.. _gettext: http://www.gnu.org/software/gettext/gettext.html
 .. _gthumb: http://gthumb.sourceforge.net
 .. _gtktalog: http://www.nongnu.org/gtktalog/
 .. _gwhere: http://www.gwhere.org/home.php3
-.. _imagemagick: http://imagemagick.org/script/index.php
-.. _intltool: http://www.gnome.org/
 .. _mplayer: http://mplayerhq.hu
 .. _nose: http://code.google.com/p/python-nose/
-.. _paver: https://pythonhosted.org/paver/
-.. _pillow: https://python-pillow.org/
-.. _pygtk 2.24: http://www.pygtk.org
-.. _python 3: http://www.python.org/
-.. _sqlalchemy 1.2: http://www.sqlalchemy.org
+.. _python 3.10: http://www.python.org/
+.. _sqlalchemy 1.4: http://www.sqlalchemy.org
 .. _tagging files: http://en.wikipedia.org/wiki/tag_%28metadata%29
 .. _tox: https://testrun.org/tox
+.. _mutagen: https://github.com/quodlibet/mutagen

pycatalog/__init__.py

@@ -1,63 +1,32 @@
-#!/usr/bin/env python
 """
-Fast and ugly CLI interface for pyGTKtalog
+Fast and ugly CLI interface
 """
 import argparse
 import os
 import re
-import sys
 
 from sqlalchemy import or_
 
-from pygtktalog import scan
-from pygtktalog import misc
-from pygtktalog import dbobjects as dbo
-from pygtktalog.dbcommon import connect, Session
-from pygtktalog import logger
-
-BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(30, 38)
-
-RESET_SEQ = '\033[0m'
-COLOR_SEQ = '\033[1;%dm'
-BOLD_SEQ = '\033[1m'
-
-LOG = logger.get_logger(__name__)
-
-
-def colorize(txt, color):
-    """Pretty print with colors to console."""
-    color_map = {'black': BLACK,
-                 'red': RED,
-                 'green': GREEN,
-                 'yellow': YELLOW,
-                 'blue': BLUE,
-                 'magenta': MAGENTA,
-                 'cyan': CYAN,
-                 'white': WHITE}
-    return COLOR_SEQ % color_map[color] + txt + RESET_SEQ
-
-
-def asserdb(func):
-    def wrapper(args):
-        if not os.path.exists(args.db):
-            print(colorize("File `%s' does not exists!" % args.db, 'red'))
-            sys.exit(1)
-        func(args)
-    return wrapper
-
+from pycatalog import scan
+from pycatalog import misc
+from pycatalog import dbobjects as dbo
+from pycatalog import dbcommon
+from pycatalog import logger
 
+LOG = logger.get_logger()
 TYPE_MAP = {0: 'd', 1: 'd', 2: 'f', 3: 'l'}
 
 
 class Iface(object):
     """Main class which interacts with the pyGTKtalog modules"""
-    def __init__(self, dbname, pretend=False, debug=False):
+    def __init__(self, dbname, pretend=False, debug=False, use_color=True):
         """Init"""
-        self.engine = connect(dbname)
-        self.sess = Session()
+        self.engine = dbcommon.connect(dbname)
+        self.sess = dbcommon.Session()
         self.dry_run = pretend
         self.root = None
         self._dbname = dbname
+        self.use_color = use_color
         if debug:
             scan.LOG.setLevel('DEBUG')
             LOG.setLevel('DEBUG')
@@ -96,11 +65,11 @@ class Iface(object):
         """Make the path to the item in the DB"""
         orig_node = node
         if node.parent == node:
-            return {u'/': (u' ', 0, u' ')}
+            return {'/': (u' ', 0, u' ')}
 
         ext = ''
-        if node.parent.type == dbo.TYPE['root']:
-            ext = colorize(' (%s)' % node.filepath, 'white')
+        if node.parent.type == dbo.TYPE['root'] and self.use_color:
+            ext = misc.colorize(' (%s)' % node.filepath, 'white')
 
         path = []
         path.append(node.filename)
@@ -140,8 +109,11 @@ class Iface(object):
         self.sess.commit()
         self.sess.close()
 
-    def list(self, path=None, recursive=False, long_=False):
+    def list(self, path=None, recursive=False, long_=False, mode='plain'):
         """Simulate ls command for the provided item path"""
+        if mode == 'mc':
+            self.use_color = False
+
         self.root = self.sess.query(dbo.File)
         self.root = self.root.filter(dbo.File.type == dbo.TYPE['root']).first()
         if path:
@@ -151,16 +123,37 @@ class Iface(object):
             node = self.root
             msg = "Content of path `/':"
 
-        print(colorize(msg, 'white'))
+        if mode != 'mc':
+            print(misc.colorize(msg, 'white'))
 
         if recursive:
             items = self._walk(node)
         else:
             items = self._list(node)
 
-        if long_:
+        if mode == 'mc':
             filenames = []
-            format_str = (u'{} {:>%d,} {} {}' %
+            format_str = ('{}    1 {}     {}   {:>%d} {} {}' %
+                          len(str(sorted([i[1] for i in
+                                          items.values()])[-1])))
+            for fname in sorted(items.keys()):
+                type_, size, date = items[fname]
+                if type_ == 'd':
+                    perms = 'drwxrwxrwx'
+                elif type_ == 'l':
+                    perms = 'lrw-rw-rw-'
+                elif type_ == 'f':
+                    perms = '-rw-rw-rw-'
+                else:
+                    continue
+                filenames.append(format_str
+                                 .format(perms, os.getuid(),
+                                         os.getgid(), size,
+                                         date.strftime('%d/%m/%Y %H:%M:%S'),
+                                         fname))
+        elif long_:
+            filenames = []
+            format_str = ('{} {:>%d,} {} {}' %
                           _get_highest_size_length(items))
             for fname in sorted(items.keys()):
                 type_, size, date = items[fname]
@@ -179,8 +172,8 @@ class Iface(object):
         self.root = self.root.filter(dbo.File.type == dbo.TYPE['root']).first()
         node = self._resolve_path(path)
         if node == self.root:
-            print(colorize('Cannot update entire db, since root was provided '
-                           'as path.', 'red'))
+            print(misc.colorize('Cannot update entire db, since root was '
+                                'provided as path.', 'red'))
             return
 
         if not dir_to_update:
@@ -189,14 +182,14 @@ class Iface(object):
         if not os.path.exists(dir_to_update):
             raise OSError("Path to updtate doesn't exists: %s", dir_to_update)
 
-        print(colorize("Updating node `%s' against directory "
-                       "`%s'" % (path, dir_to_update), 'white'))
+        print(misc.colorize("Updating node `%s' against directory "
+                            "`%s'" % (path, dir_to_update), 'white'))
         if not self.dry_run:
             scanob = scan.Scan(dir_to_update)
             # scanob.update_files(node.id)
             scanob.update_files(node.id, self.engine)
 
-    def create(self, dir_to_add, data_dir):
+    def create(self, dir_to_add, label=None):
         """Create new database"""
         self.root = dbo.File()
         self.root.id = 1
@@ -206,27 +199,17 @@ class Iface(object):
         self.root.type = 0
         self.root.parent_id = 1
 
-        config = dbo.Config()
-        config.key = 'image_path'
-        config.value = data_dir
-
         if not self.dry_run:
             self.sess.add(self.root)
-            self.sess.add(config)
             self.sess.commit()
 
-        print(colorize("Creating new db against directory `%s'" % dir_to_add,
-                       'white'))
+        print(misc.colorize("Creating new db against directory `%s'" %
+                            dir_to_add, 'white'))
         if not self.dry_run:
-            if data_dir == ':same_as_db:':
-                misc.calculate_image_path(None, True)
-            else:
-                misc.calculate_image_path(data_dir, True)
-
             scanob = scan.Scan(dir_to_add)
-            scanob.add_files(self.engine)
+            scanob.add_files(label=label)
 
-    def add(self, dir_to_add):
+    def add(self, dir_to_add, label=None):
         """Add new directory to the db"""
         self.root = self.sess.query(dbo.File)
         self.root = self.root.filter(dbo.File.type == 0).first()
@@ -234,10 +217,10 @@ class Iface(object):
         if not os.path.exists(dir_to_add):
             raise OSError("Path to add doesn't exists: %s", dir_to_add)
 
-        print(colorize("Adding directory `%s'" % dir_to_add, 'white'))
+        print(misc.colorize("Adding directory `%s'" % dir_to_add, 'white'))
         if not self.dry_run:
             scanob = scan.Scan(dir_to_add)
-            scanob.add_files()
+            scanob.add_files(label=label)
 
     def _annotate(self, item, search_words):
         """
@@ -257,12 +240,12 @@ class Iface(object):
             if idx in indexes:
                 if not highlight:
                     highlight = True
-                    result.append(COLOR_SEQ % WHITE)
+                    result.append(misc.COLOR_SEQ % misc.WHITE)
                 result.append(char)
             else:
                 if highlight:
                     highlight = False
-                    result.append(RESET_SEQ)
+                    result.append(misc.RESET_SEQ)
                 result.append(char)
 
         return "".join(result)
@@ -287,120 +270,25 @@ class Iface(object):
         for item in result:
             print(self._annotate(item, search_words))
 
-    def fsck(self):
-        """Fsck orphaned images/thumbs"""
-        image_path = (self.sess.query(dbo.Config)
-                      .filter(dbo.Config.key == 'image_path')).one().value
-
-        if image_path == ':same_as_db:':
-            image_path = misc.calculate_image_path(None, False)
-
-        files_to_remove = []
-
-        # remove images/thumbnails which doesn't have file relation
-        for name, obj in (("images", dbo.Image),
-                          ("thumbnails", dbo.Thumbnail)):
-            self._purge_orphaned_objects(obj, "Scanning %s " % name)
-
-        # find all image files not associate with either Image (image/thumb)
-        # or Thumbnail (thumb) objects
-        sys.stdout.write(40 * " " + "\r")
-        count = 0
-        for root, dirs, files in os.walk(image_path):
-            for fname in files:
-                sys.stdout.write("Scanning files " +
-                                 "| / - \\".split()[count % 4] + "\r")
-                sys.stdout.flush()
-                count += 1
-
-                fname_ = os.path.join(root.split(image_path)[1],
-                                      fname).lstrip('/')
-
-                if '_t' in fname:
-                    obj = (self.sess.query(dbo.Thumbnail)
-                           .filter(dbo.Thumbnail.filename == fname_)).all()
-                    if obj:
-                        continue
-
-                    obj = (self.sess.query(dbo.Image)
-                           .filter(dbo.Image.filename ==
-                                   fname_.replace('_t.', '.'))).all()
-                    if obj:
-                        continue
-
-                else:
-                    obj = (self.sess.query(dbo.Image)
-                           .filter(dbo.Image.filename == fname_)).all()
-                    if obj:
-                        continue
-
-                files_to_remove.append(os.path.join(root, fname))
-
-        LOG.debug("Found %d orphaned files", len(files_to_remove))
-        sys.stdout.write(40 * " " + "\r")
-        sys.stdout.flush()
-
-        if self.dry_run:
-            print("Following files are not associated to any items in the DB:")
-            for filename in sorted(files_to_remove):
-                print(filename)
-            self.sess.rollback()
-        else:
-            _remove_files(image_path, files_to_remove)
-            self.sess.commit()
-
-    def _purge_orphaned_objects(self, sa_class, msg):
-        """Return tuple of lists of images that are orphaned"""
-
-        ids_to_remove = []
-
-        for count, item in enumerate(self.sess.query(sa_class).all()):
-            sys.stdout.write(msg + "| / - \\".split()[count % 4] + "\r")
-            if not item.file:
-                self.sess.delete(item)
-                ids_to_remove.append(item.id)
-                del item
-            sys.stdout.flush()
-
-        LOG.debug("Found %d orphaned object of class %s",
-                  len(ids_to_remove), sa_class.__name__)
-        self.sess.flush()
-
-
-def _remove_files(image_path, filenames):
-    """Remove files and empty directories in provided location"""
-
-    count = 0
-    for count, fname in enumerate(filenames, start=1):
-        os.unlink(fname)
-
-    LOG.info("Removed %d orphaned files", count)
-
-    count = 0
-    for root, dirs, _ in os.walk(image_path):
-        for dirname in dirs:
-            try:
-                os.rmdir(os.path.join(root, dirname))
-                count += 1
-            except OSError:
-                pass
-    LOG.info("Removed %d empty directories", count)
-
 
 def _get_highest_size_length(item_dict):
     highest = len(str(sorted([i[1] for i in item_dict.values()])[-1]))
     return highest + highest / 3
 
 
-@asserdb
+@misc.asserdb
 def list_db(args):
     """List"""
+    if args.mode == 'mc':
+        LOG.setLevel(100)  # supress logging
+
     obj = Iface(args.db, False, args.debug)
-    obj.list(path=args.path, recursive=args.recursive, long_=args.long)
+    obj.list(path=args.path, recursive=args.recursive, long_=args.long,
+             mode=args.mode)
     obj.close()
 
 
-@asserdb
+@misc.asserdb
 def update_db(args):
     """Update"""
     obj = Iface(args.db, args.pretend, args.debug)
@@ -408,22 +296,22 @@ def update_db(args):
     obj.close()
 
 
-@asserdb
+@misc.asserdb
 def add_dir(args):
     """Add"""
     obj = Iface(args.db, args.pretend, args.debug)
-    obj.add(args.dir_to_add)
+    obj.add(args.dir_to_add, args.label)
     obj.close()
 
 
 def create_db(args):
     """List"""
     obj = Iface(args.db, args.pretend, args.debug)
-    obj.create(args.dir_to_add, args.imagedir)
+    obj.create(args.dir_to_add, args.label)
     obj.close()
 
 
-@asserdb
+@misc.asserdb
 def search(args):
     """Find"""
     obj = Iface(args.db, False, args.debug)
@@ -431,14 +319,6 @@ def search(args):
     obj.close()
 
 
-@asserdb
-def cleanup(args):
-    """Cleanup"""
-    obj = Iface(args.db, False, args.debug)
-    obj.fsck()
-    obj.close()
-
-
 def main():
     """Main"""
     parser = argparse.ArgumentParser()
@@ -447,6 +327,12 @@ def main():
     list_ = subparser.add_parser('list')
     list_.add_argument('db')
     list_.add_argument('path', nargs='?')
+    list_.add_argument('-m', '--mode', help='List items using mode. By '
+                       'default is simply plain mode, other possibility is to '
+                       'use "mc" mode, which is suitable to use with extfs '
+                       'plugin', default='plain')
+    list_.add_argument('-c', '--color', help='Use colors for listing',
+                       action='store_true', default=False)
     list_.add_argument('-l', '--long', help='Show size, date and type',
                        action='store_true', default=False)
     list_.add_argument('-r', '--recursive', help='list items in '
@@ -469,12 +355,8 @@ def main():
     create = subparser.add_parser('create')
     create.add_argument('db')
     create.add_argument('dir_to_add')
-    create.add_argument('-i', '--imagedir', help="Directory where to put "
-                        "images for the database. Popular, but deprecated "
-                        "choice is  `~/.pygtktalog/images'. Current default "
-                        "is special string `:same_as_db:' which will try to "
-                        "create directory with the same name as the db with "
-                        "data suffix", default=':same_as_db:')
+    create.add_argument('-l', '--label', help='Add label as the root item of '
+                        'the added directory')
     create.add_argument('-p', '--pretend', help="Don't do the action, just "
                         "give the info what would gonna to happen.",
                         action='store_true', default=False)
@@ -490,6 +372,8 @@ def main():
                      action='store_true', default=False)
     add.add_argument('-d', '--debug', help='Turn on debug',
                      action='store_true', default=False)
+    add.add_argument('-l', '--label', help='Add label as the root item of the '
+                     'added directory')
     add.set_defaults(func=add_dir)
 
     find = subparser.add_parser('find')
@@ -499,15 +383,6 @@ def main():
                       action='store_true', default=False)
     find.set_defaults(func=search)
 
-    fsck = subparser.add_parser('fsck')
-    fsck.add_argument('db')
-    fsck.add_argument('-p', '--pretend', help="Don't do the action, just give"
-                      " the info what would gonna to happen.",
-                      action='store_true', default=False)
-    fsck.add_argument('-d', '--debug', help='Turn on debug',
-                      action='store_true', default=False)
-    fsck.set_defaults(func=cleanup)
-
     args = parser.parse_args()
 
     if 'func' in args:

pycatalog/dbcommon.py

@@ -9,7 +9,7 @@ from sqlalchemy import MetaData, create_engine
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
 
-from pygtktalog.logger import get_logger
+from pycatalog.logger import get_logger
 
 
 # Prepare SQLAlchemy objects
@@ -18,7 +18,7 @@ Base = declarative_base(metadata=Meta)
 Session = sessionmaker()
 DbFilename = None
 
-LOG = get_logger("dbcommon")
+LOG = get_logger()
 
 
 def connect(filename=None):

pycatalog/dbobjects.py

@@ -12,13 +12,11 @@ from sqlalchemy import Column, Table, Integer, Text
 from sqlalchemy import DateTime, ForeignKey, Sequence
 from sqlalchemy.orm import relation, backref
 
-from pygtktalog.dbcommon import Base
-from pygtktalog.thumbnail import ThumbCreator
-from pygtktalog.logger import get_logger
-from pygtktalog.misc import mk_paths
+from pycatalog.dbcommon import Base
+from pycatalog.logger import get_logger
 
 
-LOG = get_logger(__name__)
+LOG = get_logger()
 
 tags_files = Table("tags_files", Base.metadata,
                    Column("file_id", Integer, ForeignKey("files.id")),
@@ -49,8 +47,6 @@ class File(Base):
                         backref=backref('parent', remote_side="File.id"),
                         order_by=[type, filename])
     tags = relation("Tag", secondary=tags_files, order_by="Tag.tag")
-    thumbnail = relation("Thumbnail", backref="file")
-    images = relation("Image", backref="file", order_by="Image.filename")
 
     def __init__(self, filename=None, path=None, date=None, size=None,
                  ftype=None, src=None):
@@ -108,7 +104,7 @@ class Tag(Base):
     tag = Column(Text)
     group = relation('Group', backref=backref('tags', remote_side="Group.id"))
 
-    files = relation("File", secondary=tags_files)
+    files = relation("File", secondary=tags_files, back_populates="tags")
 
     def __init__(self, tag=None, group=None):
         self.tag = tag
@@ -118,111 +114,6 @@ class Tag(Base):
         return "<Tag('%s', %s)>" % (str(self.tag), str(self.id))
 
 
-class Thumbnail(Base):
-    """Thumbnail for the file"""
-    __tablename__ = "thumbnails"
-    id = Column(Integer, Sequence("thumbnail_id_seq"), primary_key=True)
-    file_id = Column(Integer, ForeignKey("files.id"), index=True)
-    filename = Column(Text)
-
-    def __init__(self, filename=None, img_path=None, file_obj=None):
-        self.filename = filename
-        self.file = file_obj
-        self.img_path = img_path
-        if filename and file_obj and img_path:
-            self.save(self.filename, img_path)
-
-    def save(self, fname, img_path):
-        """
-        Create file related thumbnail, add it to the file object.
-        """
-        new_name = mk_paths(fname, img_path)
-        ext = os.path.splitext(self.filename)[1]
-        if ext:
-            new_name.append("".join([new_name.pop(), ext]))
-
-        thumb = ThumbCreator(self.filename).generate()
-        name, ext = os.path.splitext(new_name.pop())
-        new_name.append("".join([name, "_t", ext]))
-        self.filename = os.path.sep.join(new_name)
-        if not os.path.exists(os.path.join(img_path, *new_name)):
-            shutil.move(thumb, os.path.join(img_path, *new_name))
-        else:
-            LOG.info("Thumbnail already exists (%s: %s)",
-                     fname, "/".join(new_name))
-            os.unlink(thumb)
-
-    def __repr__(self):
-        return "<Thumbnail('%s', %s)>" % (str(self.filename), str(self.id))
-
-
-class Image(Base):
-    """Images and their thumbnails"""
-    __tablename__ = "images"
-    id = Column(Integer, Sequence("images_id_seq"), primary_key=True)
-    file_id = Column(Integer, ForeignKey("files.id"), index=True)
-    filename = Column(Text)
-
-    def __init__(self, filename=None, img_path=None, file_obj=None, move=True):
-        self.filename = None
-        self.file = file_obj
-        self.img_path = img_path
-        if filename and img_path:
-            self.filename = filename
-            self.save(filename, img_path, move)
-
-    def save(self, fname, img_path, move=True):
-        """
-        Save and create coressponding thumbnail (note: it differs from file
-        related thumbnail!)
-        """
-        new_name = mk_paths(fname, img_path)
-        ext = os.path.splitext(self.filename)[1]
-
-        if ext:
-            new_name.append("".join([new_name.pop(), ext]))
-
-        if not os.path.exists(os.path.join(img_path, *new_name)):
-            if move:
-                shutil.move(self.filename, os.path.join(img_path, *new_name))
-            else:
-                shutil.copy(self.filename, os.path.join(img_path, *new_name))
-        else:
-            LOG.warning("Image with same CRC already exists "
-                        "('%s', '%s')" % (self.filename, "/".join(new_name)))
-
-        self.filename = os.path.sep.join(new_name)
-
-        name, ext = os.path.splitext(new_name.pop())
-        new_name.append("".join([name, "_t", ext]))
-
-        if not os.path.exists(os.path.join(img_path, *new_name)):
-            thumb = ThumbCreator(os.path.join(img_path, self.filename))
-            shutil.move(thumb.generate(), os.path.join(img_path, *new_name))
-        else:
-            LOG.info("Thumbnail already generated %s" % "/".join(new_name))
-
-    def get_copy(self):
-        """
-        Create the very same object as self with exception of id field
-        """
-        img = Image()
-        img.filename = self.filename
-        return img
-
-    @property
-    def thumbnail(self):
-        """
-        Return path to thumbnail for this image
-        """
-        path, fname = os.path.split(self.filename)
-        base, ext = os.path.splitext(fname)
-        return os.path.join(path, base + "_t" + ext)
-
-    def __repr__(self):
-        return "<Image('%s', %s)>" % (str(self.filename), str(self.id))
-
-
 class Exif(Base):
     """Selected EXIF information"""
     __tablename__ = "exif"

pycatalog/logger.py

@@ -63,22 +63,24 @@ class ColoredFormatter(logging.Formatter):
 log_obj = None
 
 
-def get_logger(module_name, level='INFO', to_file=True, to_console=True):
+def get_logger(level='INFO', to_file=True, to_console=True):
     """
     Prepare and return log object. Standard formatting is used for all logs.
     Arguments:
-        @module_name - String name for Logger object.
         @level - Log level (as string), one of DEBUG, INFO, WARN, ERROR and
                  CRITICAL.
         @to_file - If True, additionally stores full log in file inside
-                   .pygtktalog config directory and to stderr, otherwise log
+                   .pycatalog config directory and to stderr, otherwise log
                    is only redirected to stderr.
     Returns: object of logging.Logger class
     """
+    global log_obj
+    if log_obj:
+        return log_obj
 
-    path = os.path.join(os.path.expanduser("~"), ".pygtktalog", "app.log")
+    path = os.path.join(os.path.expanduser("~"), ".pycatalog", "app.log")
 
-    log = logging.getLogger(module_name)
+    log = logging.getLogger("pycatalog")
     log.setLevel(LEVEL[level])
 
     if to_console:
@@ -104,4 +106,5 @@ def get_logger(module_name, level='INFO', to_file=True, to_console=True):
         dummy_handler.setFormatter(dummy_formatter)
         log.addHandler(dummy_handler)
 
+    log_obj = log
     return log

pycatalog/misc.py

@@ -0,0 +1,56 @@
+"""
+    Project: pyGTKtalog
+    Description: Misc functions used more than once in src
+    Type: lib
+    Author: Roman 'gryf' Dobosz, gryf73@gmail.com
+    Created: 2009-04-05
+"""
+import os
+import sys
+
+from pycatalog import logger
+
+BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(30, 38)
+
+RESET_SEQ = '\033[0m'
+COLOR_SEQ = '\033[1;%dm'
+BOLD_SEQ = '\033[1m'
+
+LOG = logger.get_logger()
+
+
+def colorize(txt, color):
+    """Pretty print with colors to console."""
+    color_map = {'black': BLACK,
+                 'red': RED,
+                 'green': GREEN,
+                 'yellow': YELLOW,
+                 'blue': BLUE,
+                 'magenta': MAGENTA,
+                 'cyan': CYAN,
+                 'white': WHITE}
+    return COLOR_SEQ % color_map[color] + txt + RESET_SEQ
+
+
+def float_to_string(float_length):
+    """
+    Parse float digit into time string
+    Arguments:
+        @number - digit to be converted into time.
+    Returns HH:MM:SS formatted string
+    """
+    hour = int(float_length / 3600)
+    float_length -= hour*3600
+    minutes = int(float_length / 60)
+    float_length -= minutes * 60
+    sec = int(float_length)
+    return f"{hour:02}:{minutes:02}:{sec:02}"
+
+
+def asserdb(func):
+    def wrapper(args):
+        if not os.path.exists(args.db):
+            print(colorize("File `%s' does not exists!" % args.db, 'red'))
+            sys.exit(1)
+        func(args)
+    return wrapper

pycatalog/scan.py

@@ -10,14 +10,16 @@ import re
 from datetime import datetime
 import mimetypes
 
-import pygtktalog.misc
-from pygtktalog.dbobjects import File, Image, Thumbnail, Config, TYPE
-from pygtktalog.dbcommon import Session
-from pygtktalog.logger import get_logger
-from pygtktalog.video import Video
+import exifread
+import mutagen
+
+from pycatalog.dbobjects import File, TYPE
+from pycatalog import dbcommon
+from pycatalog.logger import get_logger
+from pycatalog.video import Video
 
 
-LOG = get_logger(__name__)
+LOG = get_logger()
 RE_FN_START = re.compile(r'(?P<fname_start>'
                          r'(\[[^\]]*\]\s)?'
                          r'([^(]*)\s'
@@ -27,7 +29,6 @@ RE_FN_START = re.compile(r'(?P<fname_start>'
 
 class NoAccessError(Exception):
     """No access exception"""
-    pass
 
 
 class Scan(object):
@@ -45,13 +46,11 @@ class Scan(object):
         self._files = []
         self._existing_files = []  # for re-use purpose in adding
         self._existing_branch = []  # for branch storage, mainly for updating
-        self._session = Session()
+        self._session = dbcommon.Session()
         self.files_count = self._get_files_count()
         self.current_count = 0
 
-        self._set_image_path()
-
-    def add_files(self, engine=None):
+    def add_files(self, label=None):
         """
         Returns list, which contain object, modification date and file
         size.
@@ -75,6 +74,8 @@ class Scan(object):
 
         # add only first item from _files, because it is a root of the other,
         # so other will be automatically added aswell.
+        if label:
+            self._files[0].filename = label
         self._session.add(self._files[0])
         self._session.commit()
         return self._files
@@ -214,66 +215,35 @@ class Scan(object):
             pass
 
     def _audio(self, fobj, filepath):
-        # LOG.warning('audio')
-        return
+        tags = mutagen.File(filepath)
+        if not tags:
+            return
+        fobj.description = tags.pprint()
 
     def _image(self, fobj, filepath):
-        # LOG.warning('image')
-        return
+        """Read exif if exists, add it to description"""
+        with open(filepath, 'rb') as obj:
+            exif = exifread.process_file(obj)
+            if not exif:
+                return
+
+        data = []
+        # longest key + 2, since we need a colon and a space after it
+        longest_key = max([len(k) for k in exif]) + 2
+        for key in exif:
+            if 'thumbnail' in key.lower() and isinstance(exif[key], bytes):
+                data.append(f"{key + ':' :<{longest_key}}thumbnail present")
+                continue
+            data.append(f"{key + ':' :<{longest_key}}{exif[key]}")
+        fobj.description = "\n".join(data)
 
     def _video(self, fobj, filepath):
         """
         Make captures for a movie. Save it under uniq name.
         """
-        result = RE_FN_START.match(fobj.filename)
-        if result:
-            self._check_related(fobj, result.groupdict()['fname_start'])
-
         vid = Video(filepath)
-
         fobj.description = vid.get_formatted_tags()
 
-        preview_fn = vid.capture()
-        if preview_fn:
-            Image(preview_fn, self.img_path, fobj)
-
-    def _check_related(self, fobj, filename_start):
-        """
-        Try to search for related files which belongs to specified File
-        object and pattern. If found, additional File objects are created.
-
-        For example, if we have movie file named like:
-            [aXXo] Batman (1989) [D3ADBEEF].avi
-            [aXXo] Batman (1989) trailer [B00B1337].avi
-            Batman (1989) [D3ADBEEF].avi
-            Batman [D3ADBEEF].avi
-
-        And for example file '[aXXo] Batman (1989) [D3ADBEEF].avi' might have
-        some other accompanied files, like:
-
-            [aXXo] Batman (1989) [D3ADBEEF].avi.conf
-            [aXXo] Batman (1989) [DEADC0DE].nfo
-            [aXXo] Batman (1989) cover [BEEFD00D].jpg
-            [aXXo] Batman (1989) poster [FEEDD00D].jpg
-
-        Which can be atuomatically asociated with the movie.
-
-        This method find such files, and for some of them (currently images)
-        will perform extra actions - like creating corresponding Image objects.
-
-        """
-        for fname in os.listdir(fobj.filepath):
-            extension = os.path.splitext(fname)[1]
-            if fname.startswith(filename_start) and \
-               extension in ('.jpg', '.gif', '.png'):
-                full_fname = os.path.join(fobj.filepath, fname)
-                LOG.debug('found corresponding image file: %s', full_fname)
-
-                Image(full_fname, self.img_path, fobj, False)
-
-                if not fobj.thumbnail:
-                    Thumbnail(full_fname, self.img_path, fobj)
-
     def _get_all_files(self):
         """Gather all File objects"""
         self._existing_files = self._session.query(File).all()
@@ -471,17 +441,6 @@ class Scan(object):
         LOG.debug("count of files: %s", count)
         return count
 
-    def _set_image_path(self):
-        """Get or calculate the images path"""
-        image_path = (self._session.query(Config)
-                      .filter(Config.key == "image_path")).one()
-        if image_path.value == ":same_as_db:":
-            image_path = pygtktalog.misc.calculate_image_path()
-        else:
-            image_path = pygtktalog.misc.calculate_image_path(image_path.value)
-
-        self.img_path = image_path
-
 
 def _get_dirsize(path):
     """

pycatalog/video.py

@@ -13,11 +13,11 @@ import tempfile
 
 from PIL import Image
 
-from pygtktalog.misc import float_to_string
-from pygtktalog.logger import get_logger
+from pycatalog.misc import float_to_string
+from pycatalog.logger import get_logger
 
 
-LOG = get_logger("Video")
+LOG = get_logger()
 
 
 class Video(object):
@@ -208,7 +208,7 @@ class Video(object):
             @no_pictures - number of pictures
         timeit result:
             python /usr/lib/python2.6/timeit.py -n 1 -r 1 'from \
-            pygtktalog.video import Video; v = Video("/home/gryf/t/a.avi"); \
+            pycatalog.video import Video; v = Video("/home/gryf/t/a.avi"); \
             v.capture()'
             1 loops, best of 1: 18.8 sec per loop
         """

pygtktalog/__init__.py

@@ -1,18 +0,0 @@
-"""
-    Project: pyGTKtalog
-    Description: Initialization for main module - i18n and so.
-    Type: core
-    Author: Roman 'gryf' Dobosz, gryf73@gmail.com
-    Created: 2009-05-05
-"""
-__version__ = "3.0.0"
-__appname__ = "pyGTKtalog"
-__copyright__ = "\u00A9 Roman 'gryf' Dobosz"
-__summary__ = "%s is simple tool for managing file collections." % __appname__
-__web__ = "http://github.com/gryf/pygtktalog"
-
-__all__ = ['dbcommon',
-           'dbobjects',
-           'dialogs',
-           'logger',
-           'misc']

pygtktalog/gtk2/gui.py

@@ -1,257 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import gtk
-
-from pygtktalog import logger
-
-UI = """
-<ui>
-
-<menubar name="MenuBar">
-    <menu action="File">
-        <menuitem action="New"/>
-        <menuitem action="Open"/>
-        <menuitem action="Save"/>
-        <menuitem action="Save As"/>
-        <separator/>
-        <menuitem action="Import"/>
-        <menuitem action="Export"/>
-        <separator/>
-        <menuitem action="Recent"/>
-        <separator/>
-        <menuitem action="Quit"/>
-    </menu>
-    <menu action="Edit">
-        <menuitem action="Delete"/>
-        <separator/>
-        <menuitem action="Find"/>
-        <separator/>
-        <menuitem action="Preferences"/>
-    </menu>
-    <menu action="Catalog">
-        <menuitem action="Add_CD"/>
-        <menuitem action="Add_Dir"/>
-        <separator/>
-        <menuitem action="Delete_all_images"/>
-        <menuitem action="Delete_all_thumbnails"/>
-        <menuitem action="Save_all_images"/>
-        <separator/>
-        <menuitem action="Catalog_statistics"/>
-        <separator/>
-        <menuitem action="Cancel"/>
-    </menu>
-    <menu action="View">
-        <menuitem action="Toolbar"/>
-        <menuitem action="Statusbar"/>
-    </menu>
-    <menu action="Help">
-        <menuitem action="About"/>
-    </menu>
-</menubar>
-
-<toolbar name="ToolBar">
-    <toolitem action="New"/>
-    <toolitem action="Open"/>
-    <toolitem action="Save"/>
-    <separator/>
-    <toolitem action="Add_CD"/>
-    <toolitem action="Add_Dir"/>
-    <toolitem action="Find"/>
-    <separator/>
-    <toolitem action="Cancel"/>
-    <toolitem action="Quit"/>
-    <toolitem action="Debug"/>
-</toolbar>
-
-</ui>
-"""
-LOG = logger.get_logger(__name__)
-LOG.setLevel(2)
-
-
-class ConnectedWidgets(object):
-    """grouped widgets"""
-    def __init__(self, toolbar, menu):
-        super(ConnectedWidgets, self).__init__()
-        self.toolbar = toolbar
-        self.menu = menu
-
-    def hide(self):
-        self.toolbar.hide()
-        self.menu.hide()
-
-    def show(self):
-        self.toolbar.show()
-        self.menu.show()
-
-    def set_sensitive(self, state):
-        self.toolbar.set_sensitive(state)
-        self.menu.set_sensitive(state)
-
-
-class MainWindow(object):
-
-    def __init__(self, debug=False):
-        """Initialize window"""
-        LOG.debug("initialize")
-        self.window = gtk.Window()
-        self.window.set_default_size(650, -1)
-        self.window.set_title("pygtktalog")
-        self.window.connect("delete-event", self.on_quit)
-
-        self.recent = None
-        self.toolbar = None
-        self.statusbar = None
-        self.cancel = None
-        self.debug = None
-
-        vbox = gtk.VBox(False, 0)
-
-        self._setup_menu_toolbar(vbox)
-
-        # TODO:
-        # 1. toolbar with selected tags
-        # 2. main view (splitter)
-        # 3. treeview with tag cloud (left split)
-        # 4. splitter (right split)
-        # 5. file list (upper split)
-        # 6. details w images and thumb (lower split)
-        # 7. status bar (if needed…)
-
-        hbox = gtk.HBox(False, 0)
-        vbox.add(hbox)
-
-        self.window.add(vbox)
-        self.window.show_all()
-        self.debug.hide()
-
-    def fake_recent(self):
-        recent_menu = gtk.Menu()
-        for i in "one two techno foo bar baz".split():
-            item = gtk.MenuItem(i)
-            item.connect_object("activate", self.on_recent,
-                                "/some/fake/path/" + i)
-            recent_menu.append(item)
-            item.show()
-        self.recent.set_submenu(recent_menu)
-
-    def _setup_menu_toolbar(self, vbox):
-        """Create menu/toolbar using uimanager."""
-        actions = [('File', None, '_File'),
-                   ('New', gtk.STOCK_NEW, '_New', None,
-                    'Create new catalog', self.on_new),
-                   ('Open', gtk.STOCK_OPEN, '_Open', None,
-                    'Open catalog file', self.on_open),
-                   ('Save', gtk.STOCK_SAVE, '_Save', None,
-                    'Save catalog file', self.on_save),
-                   ('Save As', gtk.STOCK_SAVE_AS,
-                    '_Save As', None, None, self.on_save),
-                   ('Import', None, '_Import', None, None, self.on_import),
-                   ('Export', None, '_Export', None, None, self.on_export),
-                   ('Recent', None, '_Recent files'),
-                   ('Quit', gtk.STOCK_QUIT, '_Quit', None,
-                    'Quit the Program', self.on_quit),
-                   ('Edit', None, '_Edit'),
-                   ('Delete', gtk.STOCK_DELETE, '_Delete', None, None,
-                    self.on_delete),
-                   ('Find', gtk.STOCK_FIND, '_Find', None, 'Find file',
-                    self.on_find),
-                   ('Preferences', gtk.STOCK_PREFERENCES, '_Preferences'),
-                   ('Catalog', None, '_Catalog'),
-                   ('Add_CD', gtk.STOCK_CDROM, '_Add CD', None,
-                    'Add CD/DVD/BR to catalog'),
-                   ('Add_Dir', gtk.STOCK_DIRECTORY, '_Add Dir', None,
-                    'Add directory to catalog'),
-                   ('Delete_all_images', None, '_Delete all images'),
-                   ('Delete_all_thumbnails', None, '_Delete all thumbnails'),
-                   ('Save_all_images', None, '_Save all images…'),
-                   ('Catalog_statistics', None, '_Catalog statistics'),
-                   ('Cancel', gtk.STOCK_CANCEL, '_Cancel'),
-                   ('View', None, '_View'),
-                   ('Help', None, '_Help'),
-                   ('About', gtk.STOCK_ABOUT, '_About'),
-                   ('Debug', gtk.STOCK_DIALOG_INFO, 'Debug')]
-
-        toggles = [('Toolbar', None, '_Toolbar'),
-                   ('Statusbar', None, '_Statusbar')]
-
-        mgr = gtk.UIManager()
-        accelgrp = mgr.get_accel_group()
-        self.window.add_accel_group(accelgrp)
-
-        agrp = gtk.ActionGroup("Actions")
-        agrp.add_actions(actions)
-        agrp.add_toggle_actions(toggles)
-
-        mgr.insert_action_group(agrp, 0)
-        mgr.add_ui_from_string(UI)
-
-        help_widget = mgr.get_widget("/MenuBar/Help")
-        help_widget.set_right_justified(True)
-
-        self.recent = mgr.get_widget("/MenuBar/File/Recent")
-        self.fake_recent()
-
-        menubar = mgr.get_widget("/MenuBar")
-        vbox.pack_start(menubar)
-        self.toolbar = mgr.get_widget("/ToolBar")
-        vbox.pack_start(self.toolbar)
-
-        menu_cancel = mgr.get_widget('/MenuBar/Catalog/Cancel')
-        toolbar_cancel = mgr.get_widget('/ToolBar/Cancel')
-        self.cancel = ConnectedWidgets(toolbar_cancel, menu_cancel)
-        self.cancel.set_sensitive(False)
-
-        self.debug = mgr.get_widget('/ToolBar/Debug')
-
-        self.toolbar = mgr.get_widget('/MenuBar/View/Toolbar')
-        self.statusbar = mgr.get_widget('/MenuBar/View/Statusbar')
-
-    def on_new(self, *args, **kwargs):
-        LOG.debug("On new")
-        return
-
-    def on_open(self, *args, **kwargs):
-        LOG.debug("On open")
-        return
-
-    def on_save(self, *args, **kwargs):
-        LOG.debug("On save")
-        return
-
-    def on_save_as(self, *args, **kwargs):
-        LOG.debug("On save as")
-        return
-
-    def on_import(self, *args, **kwargs):
-        LOG.debug("On import")
-        return
-
-    def on_export(self, *args, **kwargs):
-        LOG.debug("On export")
-        return
-
-    def on_recent(self, *args, **kwargs):
-        LOG.debug("On recent")
-        print args, kwargs
-
-    def on_quit(self, *args, **kwargs):
-        LOG.debug("on quit")
-        gtk.main_quit()
-
-    def on_delete(self, *args, **kwargs):
-        LOG.debug("On delete")
-        return
-
-    def on_find(self, *args, **kwargs):
-        LOG.debug("On find")
-        return
-
-    def on_about(self, event, menuitem):
-        LOG.debug("about", event, menuitem)
-        return
-
-
-def run():
-    MainWindow()
-    gtk.mainloop()

pygtktalog/misc.py

@@ -1,77 +0,0 @@
-"""
-    Project: pyGTKtalog
-    Description: Misc functions used more than once in src
-    Type: lib
-    Author: Roman 'gryf' Dobosz, gryf73@gmail.com
-    Created: 2009-04-05
-"""
-import os
-import errno
-from zlib import crc32
-
-import pygtktalog.dbcommon
-from pygtktalog.logger import get_logger
-
-LOG = get_logger(__name__)
-
-
-def float_to_string(float_length):
-    """
-    Parse float digit into time string
-    Arguments:
-        @number - digit to be converted into time.
-    Returns HH:MM:SS formatted string
-    """
-    hour = int(float_length / 3600)
-    float_length -= hour*3600
-    minutes = int(float_length / 60)
-    float_length -= minutes * 60
-    sec = int(float_length)
-    return "%02d:%02d:%02d" % (hour, minutes, sec)
-
-
-def calculate_image_path(dbpath=None, create=False):
-    """Calculate image path out of provided path or using current connection"""
-    if not dbpath:
-        dbpath = pygtktalog.dbcommon.DbFilename
-        if dbpath == ":memory:":
-            raise OSError("Cannot create image path out of in-memory db!")
-
-        dir_, file_ = (os.path.dirname(dbpath), os.path.basename(dbpath))
-        file_base, dummy = os.path.splitext(file_)
-        images_dir = os.path.join(dir_, file_base + "_images")
-    else:
-        if dbpath and "~" in dbpath:
-            dbpath = os.path.expanduser(dbpath)
-        if dbpath and "$" in dbpath:
-            dbpath = os.path.expandvars(dbpath)
-        images_dir = dbpath
-
-    if create:
-        if not os.path.exists(images_dir):
-            try:
-                os.mkdir(images_dir)
-            except OSError as err:
-                if err.errno != errno.EEXIST:
-                    raise
-    elif not os.path.exists(images_dir):
-        raise OSError("%s: No such directory" % images_dir)
-
-    return os.path.abspath(images_dir)
-
-
-def mk_paths(fname, img_path):
-    """Make path for provided pathname by calculating crc32 out of file"""
-    with open(fname, 'r+b') as fobj:
-        new_path = "%x" % (crc32(fobj.read(10*1024*1024)) & 0xffffffff)
-
-    new_path = [new_path[i:i + 2] for i in range(0, len(new_path), 2)]
-    full_path = os.path.join(img_path, *new_path[:-1])
-
-    try:
-        os.makedirs(full_path)
-    except OSError as exc:
-        if exc.errno != errno.EEXIST:
-            LOG.debug("Directory %s already exists." % full_path)
-
-    return new_path

pygtktalog/pygtkutils.py

@@ -1,25 +0,0 @@
-"""
-Project: pyGTKtalog
-Description: pyGTK common utility functions
-Type: utility
-Author: Roman 'gryf' Dobosz, gryf73@gmail.com
-Created: 2010-11-07 13:30:37
-"""
-
-
-def get_tv_item_under_cursor(treeview):
-    """
-    Get item (most probably id of the row) form tree view under cursor.
-    Arguments:
-        @treeview - gtk.TreeView
-    Returns:
-        Item in first column of TreeModel, which TreeView is connected with,
-        None in other cases
-    """
-    path, column = treeview.get_cursor()
-    if path and column:
-        model = treeview.get_model()
-        tm_iter = model.get_iter(path)
-        item_id = model.get_value(tm_iter, 0)
-        return item_id
-    return None

pygtktalog/thumbnail.py

@@ -1,114 +0,0 @@
-"""
-    Project: pyGTKtalog
-    Description: Create thumbnail for sepcified image
-    Type: lib
-    Author: Roman 'gryf' Dobosz, gryf73@gmail.com
-    Created: 2011-05-15
-"""
-
-import os
-from tempfile import mkstemp
-import shutil
-
-from PIL import Image
-import exifread
-
-from pygtktalog.logger import get_logger
-
-
-LOG = get_logger(__name__)
-
-
-class ThumbCreator(object):
-    """
-    Class for generate/extract thumbnail from image file
-    """
-
-    def __init__(self, filename):
-        self.thumb_x = 160
-        self.thumb_y = 160
-        self.filename = filename
-
-    def generate(self):
-        """
-        Save thumbnail into temporary file
-        """
-        exif = {}
-        orientations = {2: Image.FLIP_LEFT_RIGHT,  # Mirrored horizontal
-                        3: Image.ROTATE_180,       # Rotated 180
-                        4: Image.FLIP_TOP_BOTTOM,  # Mirrored vertical
-                        5: Image.ROTATE_90,        # Mirrored horizontal then
-                                                   # rotated 90 CCW
-                        6: Image.ROTATE_270,       # Rotated 90 CW
-                        7: Image.ROTATE_270,       # Mirrored horizontal then
-                                                   # rotated 90 CW
-                        8: Image.ROTATE_90}        # Rotated 90 CCW
-        flips = {7: Image.FLIP_LEFT_RIGHT, 5: Image.FLIP_LEFT_RIGHT}
-
-        exif = self._get_exif()
-        file_desc, thumb_fn = mkstemp(suffix=".jpg")
-        os.close(file_desc)
-
-        if exif and 'JPEGThumbnail' in exif and exif['JPEGThumbnail']:
-            LOG.debug("exif thumb for filename %s" % self.filename)
-            exif_thumbnail = exif['JPEGThumbnail']
-            thumb = open(thumb_fn, 'wb')
-            thumb.write(exif_thumbnail)
-            thumb.close()
-        else:
-            LOG.debug("no exif thumb")
-            if self.is_image_smaller():
-                shutil.copyfile(self.filename, thumb_fn)
-            else:
-                thumb = self._scale_image()
-                if thumb:
-                    thumb.save(thumb_fn, "JPEG")
-
-        if exif and 'Image Orientation' in exif:
-            orient = exif['Image Orientation'].values[0]
-            if orient > 1 and orient in orientations:
-                thumb_image = Image.open(thumb_fn)
-                tmp_thumb_img = thumb_image.transpose(orientations[orient])
-
-                if orient in flips:
-                    tmp_thumb_img = tmp_thumb_img.transpose(flips[orient])
-
-                tmp_thumb_img.save(thumb_fn, 'JPEG')
-
-        return thumb_fn
-
-    def is_image_smaller(self):
-        """Check if image is smaller than desired dimention, return boolean"""
-        image = Image.open(self.filename)
-        im_x, im_y = image.size
-        image.close()
-        return im_x <= self.thumb_x and im_y <= self.thumb_y
-
-    def _get_exif(self):
-        """
-        Get exif (if available), return as a dict
-        """
-        image_file = open(self.filename, 'rb')
-        try:
-            exif = exifread.process_file(image_file)
-        except Exception:
-            exif = {}
-            LOG.info("Exif crashed on '%s'." % self.filename)
-        finally:
-            image_file.close()
-
-        return exif
-
-    def _scale_image(self):
-        """
-        Create thumbnail. returns image object or None
-        """
-        try:
-            image_thumb = Image.open(self.filename).convert('RGB')
-        except Exception:
-            return None
-        it_x, it_y = image_thumb.size
-        if it_x > self.thumb_x or it_y > self.thumb_y:
-            image_thumb.thumbnail((self.thumb_x, self.thumb_y),
-                                  Image.ANTIALIAS)
-        return image_thumb

requirements.txt

@@ -1,3 +0,0 @@
-Pillow
-exifread
-sqlalchemy

scripts/gtktalog.py

@@ -1,69 +0,0 @@
-#!/usr/bin/env python
-"""
-    Project: pyGTKtalog
-    Description: Main gui file launcher
-    Type: UI
-    Author: Roman 'gryf' Dobosz, gryf73@gmail.com
-    Created: 2016-08-19
-"""
-import sys
-import tempfile
-import os
-
-from pygtktalog.dbobjects import File, Config
-from pygtktalog.dbcommon import connect, Session
-from pygtktalog.gtk2 import gui
-
-
-class App(object):
-    """Main app class"""
-
-    def __init__(self, dbname):
-        """Initialze"""
-        self._dbname = None
-        self.sess = Session()
-
-        if dbname:
-            self._dbname = dbname
-            self.engine = connect(dbname)
-        else:
-            self._create_tmp_db()
-
-        self.root = None
-        self._dbname = dbname
-
-    def _create_tmp_db(self):
-        """Create temporatry db, untill user decide to save it"""
-        fdsc, self._tmpdb = tempfile.mkstemp()
-        os.close(fdsc)
-        self.engine = connect(self._tmpdb)
-
-        self.root = File()
-        self.root.id = 1
-        self.root.filename = 'root'
-        self.root.size = 0
-        self.root.source = 0
-        self.root.type = 0
-        self.root.parent_id = 1
-
-        config = Config()
-        config.key = "image_path"
-        config.value = ":same_as_db:"
-
-        self.sess.add(self.root)
-        self.sess.add(config)
-        self.sess.commit()
-
-    def run(self):
-        """Initialize gui"""
-        gui.run()
-
-
-def main():
-    db = sys.argv if len(sys.argv) == 2 else None
-    app = App(db)
-    app.run()
-
-
-if __name__ == "__main__":
-    main()

setup.cfg

@@ -0,0 +1,42 @@
+[metadata]
+name = pycatalog
+summary = Catalog application for keeping content list of disks and discs
+description_file = README.rst
+author = Roman Dobosz
+author_email = gryf73@gmail.com
+home_page = https://github.com/gryf/pycatalog
+license = BSD
+keywords = catalog, gwhere, collection
+classifier =
+    Development Status :: 4 - Beta
+    Environment :: Console
+    Intended Audience :: End Users/Desktop
+    License :: OSI Approved :: BSD License
+    Operating System :: POSIX :: Linux
+    Programming Language :: Python
+    Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
+    Topic :: Database
+    Topic :: Desktop Environment
+
+[install]
+record = install.log
+
+[options.entry_points]
+console_scripts =
+    pycatalog = pycatalog:main
+
+[files]
+packages =
+    pycatalog
+
+[options]
+install_requires =
+    exifread
+    sqlalchemy
+    mutagen
+
+[bdist_wheel]
+universal = 1

setup.py

@@ -1,31 +1,5 @@
-#!/usr/bin/env python2
-"""
-Setup for the pyGTKtalog project
-"""
-from distutils.core import setup
+#!/usr/bin/env python
+import setuptools
 
 
-setup(name='pygtktalog',
-      packages=['pygtktalog'],
-      version='3.0',
-      description='Catalog application with GTK interface',
-      author='Roman Dobosz',
-      author_email='gryf73@gmail.com',
-      url='https://github.com/gryf/pygtktalog',
-      download_url='https://github.com/gryf/pygtktalog.git',
-      keywords=['catalog', 'gwhere', 'where is it', 'collection', 'GTK'],
-      requires=['Pillow', 'sqlalchemy'],
-      scripts=['scripts/cmdcatalog.py'],
-      classifiers=['Programming Language :: Python :: 2',
-                   'Programming Language :: Python :: 2.7',
-                   'Programming Language :: Python :: 3',
-                   'Programming Language :: Python :: 3.6',
-                   'Development Status :: 4 - Beta',
-                   'Environment :: Console',
-                   'Intended Audience :: End Users/Desktop',
-                   'License :: OSI Approved :: BSD License',
-                   'Operating System :: OS Independent',
-                   'Topic :: Multimedia :: Graphics'],
-      long_description=open('README.rst').read(),
-      options={'test': {'verbose': False,
-                        'coverage': False}})
+setuptools.setup(setup_requires=['pbr>=2.0.0'], pbr=True)

test-requirements.txt

@@ -1,4 +1,4 @@
 pytest
 pytest-cov
-pytest-pep8
+flake8
 coverage

tests/dbcommon_test.py

@@ -8,7 +8,7 @@
 import unittest
 import os
 
-from pygtktalog.dbcommon import connect, Meta, Session, Base
+from pycatalog.dbcommon import connect
 
 
 class TestDataBase(unittest.TestCase):

tests/misc_test.py

@@ -8,7 +8,7 @@
 import unittest
 import os
 
-import pygtktalog.misc as pgtkmisc
+import pycatalog.misc as pgtkmisc
 
 
 class TestMiscModule(unittest.TestCase):

tests/scan_test.py

@@ -10,9 +10,9 @@ import shutil
 import tempfile
 import unittest
 
-from pygtktalog import scan
-from pygtktalog.dbobjects import File, Config, Image
-from pygtktalog.dbcommon import connect, Session
+from pycatalog import scan
+from pycatalog.dbobjects import File, Config, Image
+from pycatalog.dbcommon import connect, Session
 
 
 def populate_with_mock_files(dir_):

tests/video_test.py

@@ -12,7 +12,7 @@ import io
 
 import PIL
 
-from pygtktalog.video import Video
+from pycatalog.video import Video
 
 
 DATA = {"m1.avi": """ID_VIDEO_ID=0
@@ -349,7 +349,7 @@ class TestVideo(unittest.TestCase):
         self.assertEqual(mp4.tags['container'], 'lavfpref')
 
     @mock.patch('shutil.move')
-    @mock.patch('pygtktalog.video.Image')
+    @mock.patch('pycatalog.video.Image')
     @mock.patch('os.listdir')
     @mock.patch('shutil.rmtree')
     @mock.patch('os.close')
@@ -386,7 +386,7 @@ class TestVideo(unittest.TestCase):
         filename = avi.capture()
         self.assertTrue(filename is not None)
 
-        del(avi.tags['length'])
+        del avi.tags['length']
         self.assertTrue(avi.capture() is None)
 
         self.assertTrue(len(str(avi)) > 0)

tox.ini

@@ -7,13 +7,13 @@ usedevelop = True
 basepython = python3
 usedevelop=True
 setenv = COVERAGE_FILE = .coverage
-commands = py.test --cov=pygtktalog --cov-report=term-missing
+commands = py.test --cov=pycatalog --cov-report=term-missing
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
 
 [testenv:pep8]
 usedevelop=True
-commands = py.test --pep8 -m pep8
+commands = flake8
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt