update urls to new github comictagger organization

1.2.0+2

.gitignore

@@ -3,4 +3,10 @@
 /dist
 *.pyc
 /.vscode
-venv
+venv
+*.o
+*.a
+*.so
+build/
+ctversion.py
+.eggs

.travis.yml

@@ -1,21 +1,42 @@
-language: generic
-os: osx
-osx_image: xcode8.3
+language: python
+branches:
+  only:
+    - develop
+    - /^\d+\.\d+\.\d+$/
+env:
+  global:
+    - PYTHON=python
+    - PIP=pip
+    - SETUPTOOLS_SCM_PRETEND_VERSION=$TRAVIS_TAG
+    - MAKE=make
+matrix:
+  include:
+    - os: linux
+    - os: osx
+      language: generic
+      osx_image: xcode8.3
+      env: PYTHON=python3 PIP=pip3 MACOSX_DEPLOYMENT_TARGET=10.11
+    - os: windows
+      language: bash
+      env: PATH=/C/Python37:/C/Python37/Scripts:$PATH MAKE=mingw32-make
+before_install:
+  - if [ "$TRAVIS_OS_NAME" = "windows" ]; then choco install -y python mingw zip; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew upgrade python3 ; fi
 install:
-- brew upgrade python3
-- pip3 install --upgrade setuptools
-- pip3 install -r requirements.txt
+  - $PIP install --upgrade setuptools
+  - $PIP install -r requirements.txt
 script:
-- make dist
-- ls -l dist
+  - $MAKE dist
+
 deploy:
+  name: $TRAVIS_TAG
+  body: Released ComicTagger $TRAVIS_TAG
   provider: releases
   skip_cleanup: true
   api_key:
     secure: RgohcOJOfLhXXT12bMWaLwOqhe+ClSCYXjYuUJuWK4/E1fdd1xu1ebdQU+MI/R8cZ0Efz3sr2n3NkO/Aa8gN68xEfuF7RVRMm64P9oPrfZgGdsD6H43rU/6kN8bgaDRmCYpLTfXaJ+/gq0x1QDkhWJuceF2BYEGGvL0BvS/TUsLyjVxs8ujTplLyguXHNEv4/7Yz7SBNZZmUHjBuq/y+l8ds3ra9rSgAVAN1tMXoFKJPv+SNNkpTo5WUNMPzBnN041F1rzqHwYDLog2V7Krp9JkXzheRFdAr51/tJBYzEd8AtYVdYvaIvoO6A4PiTZ7MpsmcZZPAWqLQU00UTm/PhT/LVR+7+f8lOBG07RgNNHB+edjDRz3TAuqyuZl9wURWTZKTPuO49TkZMz7Wm0DRNZHvBm1IXLeSG7Tll2YL1+WpZNZg+Dhro2J1QD3vxDXafhMdTCB4z0q5aKpG93IT0p6oXOO0oEGOPZYbA2c5R3SXWSyqd1E1gdhbVjIZr59h++TEf1zz07tvWHqPuAF/Ly/j+dIcY2wj0EzRWaSASWgUpTnMljAkHtWhqDw4GXGDRkRUWRJl1d0/JyVqCeIdRzDQNl8/q7BcO3F1zqr1PgnYdz0lfwWxL1/ekw2vHOJE/GOdkyvX0aJrnaOV338mjJbfGHYv4ESc9ow1kdtIbiU=
   file_glob: true  
-  file: dist/ComicTagger*.zip
+  file: dist/*.zip
   draft: true
-  on:
-    branch: master
-    tags: true
+  on:    
+    tags: true

Makefile

@@ -1,4 +1,5 @@
-VERSION_STR := $(shell python -c 'import comictaggerlib.ctversion; print( comictaggerlib.ctversion.version)')
+PIP ?= pip
+VERSION_STR := $(shell python setup.py --version)
 
 ifeq ($(OS),Windows_NT)
 	OS_VERSION=win-$(PROCESSOR_ARCHITECTURE)
@@ -30,6 +31,7 @@ clean:
 	rm -f unrar/libunrar.so unrar/libunrar.a unrar/unrar
 	rm -f comictaggerlib/libunrar.so
 	rm -rf comictaggerlib/ui/__pycache__
+	rm comitaggerlib/ctversion.py
 
 pydist:
 	make clean
@@ -53,5 +55,6 @@ else
 endif
 
 dist: unrar
+	$(PIP) install .
 	pyinstaller -y comictagger.spec
 	cd dist && zip -r $(FINAL_NAME).zip $(APP_NAME)

README.md

@@ -1,29 +1,48 @@
+[![Build Status](https://travis-ci.org/comictagger/comictagger.svg?branch=develop)](https://travis-ci.org/comictagger/comictagger)
+[![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/comictagger/community)
+[![Google Group](https://img.shields.io/badge/discuss-on%20groups-%23207de5)](https://groups.google.com/forum/#!forum/comictagger)
+[![Twitter](https://img.shields.io/badge/%40comictagger-twitter-lightgrey)](https://twitter.com/comictagger)
+[![Facebook](https://img.shields.io/badge/comictagger-facebook-lightgrey)](https://www.facebook.com/ComicTagger-139615369550787/)
 
-ComicTagger is a multi-platform app for writing metadata to digital comics, written in Python and PyQt.
+# ComicTagger
 
-Features:
+ComicTagger is a **multi-platform** app for **writing metadata to digital comics**, written in Python and PyQt.
 
-* Runs on Mac OSX, Microsoft Windows, and Linux systems
-* Communicates with an online database (Comic Vine) for acquiring metadata
-* Uses image processing to automatically match a given archive with the correct issue data
-* Batch processing in the GUI for tagging hundreds or more comics at a time
-* Reads and writes multiple tagging schemes (ComicBookLover and ComicRack).
-* Reads and writes RAR and Zip archives (external tools needed for writing RAR)
-* Can run without PyQt5 installed 
+![ComicTagger logo](comictaggerlib/graphics/app.png?raw=true)
+
+## Features
+
+* Runs on macOS, Microsoft Windows, and Linux systems
+* Get comic information from [Comic Vine](https://comicvine.gamespot.com/)
+* **Automatic issue matching** using advanced image processing techniques
+* **Batch processing** in the GUI for tagging hundreds or more comics at a time
+* Support for **ComicRack** and **ComicBookLover** tagging formats
+* Native full support for **CBZ** digital comics
+* Native read only support for **CBR** digital comics: full support enabled installing additional [rar tools](https://www.rarlab.com/download.htm)
+* Command line interface (CLI) enabling **custom scripting** and **batch operations on large collections**
+
+For details, screen-shots, release notes, and more, visit [the Wiki](https://github.com/comictagger/comictagger/wiki)
 
 
-Recent changes:
- - Ported to Python 3
- - Ported to PyQt5
- - Added more application and GUI awareness of the unrar library, and removed references to the old scheme that used the unrar executable.  
- - Got setup.py working again to build sdist packages, suitable (I think) for PyPI. An install from the package will attempt to build unrar library.  It should work on most Linux distros, and was tested on a Mac OSX system with dev tools from homebrew.  If the library doesn't build, the GUI has instructions on where to download the library.
- - Removed/changes obsolete links to old Google code website.
- - Set a environment variable to scale the GUI on 4k displays
- 
-Notes:
-- I did some testing with the pyinstaller build, and it worked on both platforms.  I did encounter two problems:
-  - Mac build showed the wrong widget set. I found a solution here that seemed to work: https://stackoverflow.com/questions/48626999/packaging-with-pyinstaller-pyqt5-setstyle-ignored
-  - Windows build had problems grabbing images from ComicVine using SSL.  It think that some libraries are missing from the monolithic exe, but I couldn't figure out how to fix the problem. 
-- In setup.py you can also find the remains of an attempt to do some desktop integration from a pip install.  It does work, but can cause problems with wheel installs, and I don't know if it's worth the bother.  I kept the commented-out code in place, just in case.
+## Installation
 
-With Python 3, it's much easier to get the app working from scratch on a new distro, as all of the dependencies are available as wheels, including PyQt5, so just a simple "pip install comictagger.zip" is all that's needed.
+### Binaries
+
+Windows and macOS binaries are provided in the [Releases Page](https://github.com/comictagger/comictagger/releases). 
+
+Just unzip the archive in any folder and run, no additional installation steps are required.
+
+### PIP installation
+
+A pip package is provided, you can install it with:
+
+```
+ $ pip install comictagger
+```
+
+### From source
+
+ 1. ensure you have a recent version of python3 and setuptools installed
+ 2. clone this repository `git clone https://github.com/comictagger/comictagger.git`
+ 3. `pip install -r requirements.txt`
+ 4. `python comictagger.py`

appveyor.yml

@@ -1,18 +0,0 @@
-version: 1.0.{build}
-build_script:
-- cmd: powershell -exec bypass -File windows\fullbuild.ps1
-artifacts:
-- path: dist\*.zip
-  name: ComicTagger
-deploy:
-  description: New Windows Release
-  provider: GitHub
-  auth_token:
-    secure: GftVXNVTfnfWxlCIWNsufQjgrLqGPbrhK7bddzZ+6onYbbx6vEKWku0QMZjcxq/D
-  draft: true
-  prerelease: false
-  artifact: ComicTagger
-  on:
-    branch: master
-    APPVEYOR_REPO_TAG: true
-    

comictagger.spec

@@ -1,6 +1,7 @@
 # -*- mode: python -*-
 
 import platform
+from comictaggerlib import ctversion
 
 block_cipher = None
 
@@ -9,10 +10,12 @@ binaries = [
 ]
 
 if platform.system() == "Windows":
+    from site import getsitepackages
+    sitepackages = getsitepackages()[1]
     # add ssl qt libraries not discovered automatically
     binaries.extend([
-        ('./venv/Lib/site-packages/PyQt5/Qt/bin/libeay32.dll', './PyQt5/Qt/bin'),
-        ('./venv/Lib/site-packages/PyQt5/Qt/bin/ssleay32.dll', './PyQt5/Qt/bin')
+        ('%s/PyQt5/Qt/bin/libeay32.dll' % sitepackages, './PyQt5/Qt/bin'),
+        ('%s/PyQt5/Qt/bin/ssleay32.dll' % sitepackages, './PyQt5/Qt/bin')
     ])
 
 a = Analysis(['comictagger.py'],
@@ -45,6 +48,9 @@ app = BUNDLE(exe,
             name='ComicTagger.app',
             icon='mac/app.icns',
             info_plist={
-                'NSHighResolutionCapable': 'True'
+                'NSHighResolutionCapable': 'True',
+                'CFBundleDisplayName': 'ComicTagger',
+                'CFBundleShortVersionString': ctversion.version,
+                'CFBundleVersion': ctversion.version
             },
             bundle_identifier=None)

comictaggerlib/ctversion.py

@@ -1,3 +0,0 @@
-# This file should contain only these comments, and the line below.
-# Used by packaging makefiles and app
-version = "1.2.0"

comictaggerlib/taggerwindow.py

@@ -545,7 +545,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
 
     def aboutApp(self):
 
-        website = "https://github.com/davide-romanini/comictagger"
+        website = "https://github.com/comictagger/comictagger"
         email = "comictagger@gmail.com"
         license_link = "http://www.apache.org/licenses/LICENSE-2.0"
         license_name = "Apache License 2.0"
@@ -582,35 +582,8 @@ class TaggerWindow(QtWidgets.QMainWindow):
             if self.droppedFiles is not None:
                 event.accept()
 
-    # http://stackoverflow.com/questions/34689562/pyqt-mimedata-filename
     def getUrlFromLocalFileID(self, localFileID):
-        import sys
-        if not sys.platform == 'darwin':
-            return localFileID.toLocalFile()
-
-        import objc
-        import CoreFoundation as CF
-        localFileQString = QString(localFileID.toLocalFile())
-        relCFStringRef = CF.CFStringCreateWithCString(
-            CF.kCFAllocatorDefault,
-            localFileQString.toUtf8(),
-            CF.kCFStringEncodingUTF8
-            )
-        relCFURL = CF.CFURLCreateWithFileSystemPath(
-            CF.kCFAllocatorDefault,
-            relCFStringRef,
-            CF.kCFURLPOSIXPathStyle,
-            False  # is directory
-            )
-        absCFURL = CF.CFURLCreateFilePathURL(
-            CF.kCFAllocatorDefault,
-            relCFURL,
-            objc.NULL
-            )
-
-        local = QUrl(str(absCFURL[0])).toLocalFile()
-        
-        return local
+            return localFileID.toLocalFile()        
 
     def dropEvent(self, event):
         # if self.dirtyFlagVerification("Open Archive",
@@ -2049,10 +2022,10 @@ class TaggerWindow(QtWidgets.QMainWindow):
             dlg.exec_()
 
     def showWiki(self):
-        webbrowser.open("https://github.com/davide-romanini/comictagger/wiki")
+        webbrowser.open("https://github.com/comictagger/comictagger/wiki")
 
     def reportBug(self):
-        webbrowser.open("https://github.com/davide-romanini/comictagger/issues")
+        webbrowser.open("https://github.com/comictagger/comictagger/issues")
 
     def showForum(self):
         webbrowser.open("http://comictagger.forumotion.com/")

current_version.txt

@@ -1 +0,0 @@
-1.2.0

mac/Makefile

@@ -5,7 +5,7 @@ TAGGER_BASE ?= ../
 TAGGER_SRC := $(TAGGER_BASE)/comictaggerlib
 
 APP_NAME := ComicTagger
-VERSION_STR := $(shell grep version $(TAGGER_SRC)/ctversion.py| cut -d= -f2 | sed 's/\"//g')
+VERSION_STR := $(shell python setup.py --version)
 
 MAC_BASE := $(TAGGER_BASE)/mac
 DIST_DIR := $(MAC_BASE)/dist

requirements.txt

@@ -5,4 +5,4 @@ natsort==3.5.2
 PyPDF2==1.24
 pillow>=4.3.0
 PyQt5>=5.10.1
-git+https://github.com/pyinstaller/pyinstaller@develop
+pyinstaller>=3.5

setup.py

@@ -23,7 +23,6 @@ import sys
 import shutil
 import platform
 import tempfile
-import comictaggerlib.ctversion
 
 python_requires='>=3',
 
@@ -193,18 +192,22 @@ setup(name="comictagger",
         'build_py': BuildPyCommand,
         'install': customInstall,
         },
-      version=comictaggerlib.ctversion.version,
       description="A cross-platform GUI/CLI app for writing metadata to comic archives",
       author="ComicTagger team",
       author_email="comictagger@gmail.com",
-      url="https://github.com/davide-romanini/comictagger",
-      download_url="https://pypi.python.org/packages/source/c/comictagger/comictagger-{0}.zip".format(comictaggerlib.ctversion.version),
+      url="https://github.com/comictagger/comictagger",      
       packages=["comictaggerlib", "comicapi"],
       package_data={
           'comictaggerlib': ['ui/*', 'graphics/*', '*.so'],
       },
       entry_points=dict(console_scripts=['comictagger=comictaggerlib.main:ctmain']),
       data_files=platform_data_files,
+      setup_requires=[
+        "setuptools_scm"
+      ],
+      use_scm_version={
+          'write_to': 'comictaggerlib/ctversion.py'
+      },
       classifiers=[
             "Development Status :: 4 - Beta",
             "Environment :: Console",

windows/fullbuild.ps1

@@ -1,8 +0,0 @@
-# Script to be run inside appveyor for a full build
-choco install -y mingw zip
-refreshenv
-$env:PATH="C:\Python36-x64;$env:path"
-python -m venv venv
-.\venv\Scripts\Activate.ps1
-pip install -r .\requirements.txt
-mingw32-make dist