fixing wrong filename written to md5 hash file

README.md

@@ -1,3 +1,9 @@
+# Question!
+
+How many of use Windows vs. Linux to run this software?  I have an idea to accommodate the CAPTCHA and make the downloader more interactive, but I don't have the expertise to create it on Linux -- thus will only do it if you guys are using Windows.
+
+Please let me know at [email protected] which OS you use and if you'd be interested.
+
 # hb-downloader
 [![Coverage Status](https://coveralls.io/repos/github/MayeulC/hb-downloader/badge.svg)](https://coveralls.io/github/MayeulC/hb-downloader)
 [![Build Status](https://travis-ci.org/MayeulC/hb-downloader.svg)](https://travis-ci.org/MayeulC/hb-downloader)

hb-downloader.py

@@ -1,11 +1,11 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import logger
-from config_data import ConfigData
-from configuration import Configuration
-from event_handler import EventHandler
-from humble_api.humble_api import HumbleApi
-from actions import Action
+import hb_downloader.logger as logger
+from hb_downloader.config_data import ConfigData
+from hb_downloader.configuration import Configuration
+from hb_downloader.event_handler import EventHandler
+from hb_downloader.humble_api.humble_api import HumbleApi
+from hb_downloader.actions import Action
 
 __author__ = "Brian Schkerke"
 __copyright__ = "Copyright 2016 Brian Schkerke"
@@ -19,7 +19,13 @@
 print("")
 
 # Load the configuration from the YAML file...
-Configuration.load_configuration("hb-downloader-settings.yaml")
+try:
+    Configuration.load_configuration("/etc/hb_downloader.yaml")
+except FileNotFoundError:
+    print("Configuration File not found in /etc")
+    print("Trying local instead...")
+    Configuration.load_configuration("hb-downloader-settings.yaml")
+
 Configuration.parse_command_line()
 Configuration.dump_configuration()
 Configuration.push_configuration()

actions.py → hb_downloader/actions.py

@@ -3,10 +3,10 @@
 
 __license__ = "MIT"
 
-from humble_download import HumbleDownload
-from progress_tracker import ProgressTracker
-from config_data import ConfigData
-import logger
+from hb_downloader.humble_download import HumbleDownload
+from hb_downloader.progress_tracker import ProgressTracker
+from hb_downloader.config_data import ConfigData
+from hb_downloader import logger
 
 
 class Action:

configuration.py → hb_downloader/configuration.py

@@ -3,9 +3,9 @@
 import argparse
 import os
 import yaml
-import logger
-from config_data import ConfigData
-from humble_api.humble_hash import HumbleHash
+from hb_downloader import logger
+from hb_downloader.config_data import ConfigData
+from hb_downloader.humble_api.humble_hash import HumbleHash
 
 __author__ = "Brian Schkerke"
 __copyright__ = "Copyright 2016 Brian Schkerke"

event_handler.py → hb_downloader/event_handler.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 import sys
-import logger
-from humble_api.events import Events
+from hb_downloader import logger
+from hb_downloader.humble_api.events import Events
 
 __author__ = "Brian Schkerke"
 __copyright__ = "Copyright 2016 Brian Schkerke"

humble_api/humble_hash.py → hb_downloader/humble_api/humble_hash.py

@@ -154,7 +154,7 @@ def write_md5file(full_filename, checksum):
             return
 
         md5full_filename = HumbleHash.md5filename(full_filename)
-        local_filename = os.path.basename(md5full_filename)
+        local_filename = os.path.basename(full_filename)
 
         if os.path.exists(md5full_filename):
             os.remove(md5full_filename)

humble_download.py → hb_downloader/humble_download.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 import os
 import requests
-from config_data import ConfigData
-from humble_api.events import Events
-from humble_api.humble_hash import HumbleHash
+from hb_downloader.config_data import ConfigData
+from hb_downloader.humble_api.events import Events
+from hb_downloader.humble_api.humble_hash import HumbleHash
 
 __author__ = "Brian Schkerke"
 __copyright__ = "Copyright 2016 Brian Schkerke"

logger.py → hb_downloader/logger.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-from config_data import ConfigData
+from hb_downloader.config_data import ConfigData
 import time
 import sys
 

progress_tracker.py → hb_downloader/progress_tracker.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
-import logger
+from hb_downloader import logger
 
 __author__ = "Brian Schkerke"
 __copyright__ = "Copyright 2016 Brian Schkerke"

test/test_parse_cmdline.py → hb_downloader/test/test_parse_cmdline.py

@@ -3,8 +3,8 @@
 
 import sys
 import subprocess
-from config_data import ConfigData
-from configuration import Configuration
+from hb_downloader.config_data import ConfigData
+from hb_downloader.configuration import Configuration
 
 actions = ["download", "list"]
 

setup.py

@@ -0,0 +1,17 @@
+from setuptools import setup
+
+setup(name='hb_downloader',
+      version='0.5.0',
+      description='an unofficial api client for humblebundle',
+      url='https://github.com/MayeulC/hb-downloader/releases',
+      author='Brian Schkerke',
+      license='MIT',
+      packages=[
+          'hb_downloader',
+          'hb_downloader.humble_api',
+          'hb_downloader.humble_api.model',
+          'hb_downloader.humble_api.exceptions'
+          ],
+      test_suite='nose.collector',
+      tests_require=['nose'],
+      zip_safe=False)