From f72afd2f1248b69ab5c9da38daf4f150db4a88d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Bonhomme?= Date: Fri, 20 Dec 2019 00:02:37 +0100 Subject: [PATCH] simplying project root --- MANIFEST.in | 10 ---- bin/stegano-lsb | 104 -------------------------------------- pyproject.toml | 35 ++++++++++++- setup.cfg | 2 - setup.py => setup.py.back | 2 +- 5 files changed, 34 insertions(+), 119 deletions(-) delete mode 100644 MANIFEST.in delete mode 100755 bin/stegano-lsb delete mode 100644 setup.cfg rename setup.py => setup.py.back (97%) diff --git a/MANIFEST.in b/MANIFEST.in deleted file mode 100644 index 7ecc55c..0000000 --- a/MANIFEST.in +++ /dev/null @@ -1,10 +0,0 @@ -#documentation -recursive-include docs * - -# binary files -recursive-include bin * - -#Misc -include COPYING -include README.md -include CHANGELOG.md diff --git a/bin/stegano-lsb b/bin/stegano-lsb deleted file mode 100755 index 8e95c65..0000000 --- a/bin/stegano-lsb +++ /dev/null @@ -1,104 +0,0 @@ -#!/usr/bin/env python -# -*- coding: utf-8 -*- - -# Stegano - Stegano is a pure Python steganography module. -# Copyright (C) 2010-2019 Cédric Bonhomme - https://www.cedricbonhomme.org -# -# For more information : https://github.com/cedricbonhomme/Stegano -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see - -__author__ = "Cedric Bonhomme" -__version__ = "$Revision: 0.8 $" -__date__ = "$Date: 2016/08/04 $" -__revision__ = "$Date: 2019/06/01 $" -__license__ = "GPLv3" - -try: - from stegano import lsb -except: - print("Install Stegano: pipx install Stegano") - -from stegano import tools - -import argparse -parser = argparse.ArgumentParser(prog='stegano-lsb') -subparsers = parser.add_subparsers(help='sub-command help', dest='command') - -# Subparser: Hide -parser_hide = subparsers.add_parser('hide', help='hide help') -# Original image -parser_hide.add_argument("-i", "--input", dest="input_image_file", - required=True, help="Input image file.") -parser_hide.add_argument("-e", "--encoding", dest="encoding", - choices=tools.ENCODINGS.keys(), default='UTF-8', - help="Specify the encoding of the message to hide." + - " UTF-8 (default) or UTF-32LE.") - -group_secret = parser_hide.add_mutually_exclusive_group(required=True) -# Non binary secret message to hide -group_secret.add_argument("-m", dest="secret_message", - help="Your secret message to hide (non binary).") -# Binary secret message to hide -group_secret.add_argument("-f", dest="secret_file", - help="Your secret to hide (Text or any binary file).") - -# Image containing the secret -parser_hide.add_argument("-o", "--output", dest="output_image_file", - required=True, help="Output image containing the secret.") - -# Shift the message to hide -parser_hide.add_argument("-s", "--shift", dest="shift", default=0, - help="Shift for the message to hide") - -# Subparser: Reveal -parser_reveal = subparsers.add_parser('reveal', help='reveal help') -parser_reveal.add_argument("-i", "--input", dest="input_image_file", - required=True, help="Input image file.") -parser_reveal.add_argument("-e", "--encoding", dest="encoding", - choices=tools.ENCODINGS.keys(), default='UTF-8', - help="Specify the encoding of the message to reveal." + - " UTF-8 (default) or UTF-32LE.") -parser_reveal.add_argument("-o", dest="secret_binary", - help="Output for the binary secret (Text or any binary file).") -# Shift the message to reveal -parser_reveal.add_argument("-s", "--shift", dest="shift", default=0, - help="Shift for the reveal") - -arguments = parser.parse_args() - - -if arguments.command == 'hide': - if arguments.secret_message != None: - secret = arguments.secret_message - elif arguments.secret_file != None: - secret = tools.binary2base64(arguments.secret_file) - - img_encoded = lsb.hide(arguments.input_image_file, secret, - arguments.encoding, int(arguments.shift)) - try: - img_encoded.save(arguments.output_image_file) - except Exception as e: - # If hide() returns an error (Too long message). - print(e) - -elif arguments.command == 'reveal': - secret = lsb.reveal(arguments.input_image_file, arguments.encoding, - int(arguments.shift)) - if arguments.secret_binary != None: - data = tools.base642binary(secret) - with open(arguments.secret_binary, "wb") as f: - f.write(data) - else: - print(secret) diff --git a/pyproject.toml b/pyproject.toml index 5b980b2..8b8ad43 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,9 +1,40 @@ [tool.poetry] name = "stegano" -version = "0.9.7" +version = "0.9.8" description = "A pure Python Steganography module." -authors = ["Cédric Bonhomme "] +authors = [ + "Cédric Bonhomme " +] license = "GPL-3.0-or-later" +readme = "README.md" +homepage = "https://git.sr.ht/~cedric/stegano" +repository = "https://git.sr.ht/~cedric/stegano" +documentation = "https://stegano.readthedocs.io" +classifiers = [ + "Development Status :: 5 - Production/Stable", + "Environment :: Console", + "Intended Audience :: Developers", + "Intended Audience :: Science/Research", + "Topic :: Security", + "Operating System :: OS Independent", + "Programming Language :: Python :: 3.7", + "Programming Language :: Python :: 3.8", + "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)" +] +include = [ + "CHANGELOG.md", + "COPYING", + "CHANGELOG.md", + "docs/**/*", + "bin/" +] + +[tool.poetry.scripts] +stegano-lsb = "bin:steganolsb" +# stegano-lsb-set = "bin.stegano-lsb-set" +# stegano-red = "bin.stegano-red" +# stegano-steganalysis-parity = "bin.stegano-steganalysis-parity" +# stegano-steganalysis-statistics = "bin.stegano-steganalysis-statistics" [tool.poetry.dependencies] python = "^3.7" diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index b88034e..0000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[metadata] -description-file = README.md diff --git a/setup.py b/setup.py.back similarity index 97% rename from setup.py rename to setup.py.back index 85505b0..8aab922 100644 --- a/setup.py +++ b/setup.py.back @@ -39,7 +39,7 @@ setup( packages=packages, include_package_data=True, scripts=scripts, - url='https://git.sr.ht/~cedric/Stegano', + url='https://git.sr.ht/~cedric/stegano', description='A pure Python Steganography module.', long_description_content_type='text/markdown', long_description=readme + '\n\n' + changelog,