Add single source for version

DownloaderForReddit/AboutDialog.py

@@ -26,6 +26,7 @@
 from PyQt5 import QtWidgets, QtCore, QtGui
 
 from AboutDialog_auto import Ui_About
+from version import __version__
 
 
 class AboutDialog(QtWidgets.QDialog, Ui_About):
@@ -46,7 +47,7 @@ def __init__(self):
         self.logo_label.setPixmap(pixmap)
         self.logo_label.setScaledContents(True)
 
-        self.info_label.setText('Version: 1.0.1\nAuthor: Kyle H')
+        self.info_label.setText('Version: %s\nAuthor: Kyle H' % __version__)
         self.info_label.setScaledContents(True)
 
         self.link_label.setText('Homepage: <a href="https://github.com/MalloyDelacroix/DownloaderForReddit">Downloader for Reddit</a>')

DownloaderForReddit/RedditDownloaderGUI.py

@@ -45,14 +45,15 @@
 from UnfinishedDownloadsDialog import UnfinishedDownloadsDialog
 from AboutDialog import AboutDialog
 from UpdaterChecker import UpdateChecker
+from version import __version__
 
 
 class RedditDownloaderGUI(QtWidgets.QMainWindow, Ui_MainWindow):
 
     stop_download = QtCore.pyqtSignal()
     update_user_finder = QtCore.pyqtSignal()
 
-    def __init__(self, version, queue, receiver):
+    def __init__(self, queue, receiver):
         """
         The main GUI window that all interaction is done through.
 
@@ -63,7 +64,7 @@ def __init__(self, version, queue, receiver):
         """
         QtWidgets.QMainWindow.__init__(self)
         self.setupUi(self)
-        self.version = version
+        self.version = __version__
         self.failed_list = []
         self.last_downloaded_users = []
         self.download_count = 0
@@ -400,9 +401,10 @@ def run(self):
 
     def run_user(self):
         user_list = self.user_view_chooser_dict[self.user_lists_combo.currentText()].reddit_object_list
-        self.reddit_extractor = RedditExtractor(user_list, None, self.queue, self.post_limit, self.save_path,
-                                                self.subreddit_sort_method, self.subreddit_sort_top_method,
-                                                self.restrict_date, self.restrict_by_submission_score,
+        self.reddit_extractor = RedditExtractor(user_list, None, self.queue, self.post_limit,
+                                                self.save_path, self.subreddit_sort_method,
+                                                self.subreddit_sort_top_method, self.restrict_date,
+                                                self.restrict_by_submission_score,
                                                 self.restrict_by_submission_score_method,
                                                 self.restrict_by_submission_score_limit, None)
         self.stop_download.connect(self.reddit_extractor.stop_download)
@@ -428,9 +430,10 @@ def run_single_user(self, user):
         """
         self.started_download_gui_shift()
         user_list = [user]
-        self.reddit_extractor = RedditExtractor(user_list, None, self.queue, self.post_limit, self.save_path,
-                                                self.subreddit_sort_method, self.subreddit_sort_top_method,
-                                                self.restrict_date, self.restrict_by_submission_score,
+        self.reddit_extractor = RedditExtractor(user_list, None, self.queue, self.post_limit,
+                                                self.save_path, self.subreddit_sort_method,
+                                                self.subreddit_sort_top_method, self.restrict_date,
+                                                self.restrict_by_submission_score,
                                                 self.restrict_by_submission_score_method,
                                                 self.restrict_by_submission_score_limit, None)
         self.stop_download.connect(self.reddit_extractor.stop_download)
@@ -449,9 +452,10 @@ def run_single_user(self, user):
 
     def run_subreddit(self):
         subreddit_list = self.subreddit_view_chooser_dict[self.subreddit_list_combo.currentText()].reddit_object_list
-        self.reddit_extractor = RedditExtractor(None, subreddit_list, self.queue, self.post_limit, self.save_path,
-                                                self.subreddit_sort_method, self.subreddit_sort_top_method,
-                                                self.restrict_date, self.restrict_by_submission_score,
+        self.reddit_extractor = RedditExtractor(None, subreddit_list, self.queue, self.post_limit,
+                                                self.save_path, self.subreddit_sort_method,
+                                                self.subreddit_sort_top_method, self.restrict_date,
+                                                self.restrict_by_submission_score,
                                                 self.restrict_by_submission_score_method,
                                                 self.restrict_by_submission_score_limit, None)
         self.stop_download.connect(self.reddit_extractor.stop_download)
@@ -476,9 +480,10 @@ def run_single_subreddit(self, subreddit):
         """
         self.started_download_gui_shift()
         subreddit_list = [subreddit]
-        self.reddit_extractor = RedditExtractor(None, subreddit_list, self.queue, self.post_limit, self.save_path,
-                                                self.subreddit_sort_method, self.subreddit_sort_top_method,
-                                                self.restrict_date, self.restrict_by_submission_score,
+        self.reddit_extractor = RedditExtractor(None, subreddit_list, self.queue, self.post_limit,
+                                                self.save_path, self.subreddit_sort_method,
+                                                self.subreddit_sort_top_method, self.restrict_date,
+                                                self.restrict_by_submission_score,
                                                 self.restrict_by_submission_score_method,
                                                 self.restrict_by_submission_score_limit, None)
         self.stop_download.connect(self.reddit_extractor.stop_download)
@@ -502,9 +507,10 @@ def run_user_and_subreddit(self):
         """
         user_list = self.user_view_chooser_dict[self.user_lists_combo.currentText()].reddit_object_list
         subreddit_list = self.subreddit_view_chooser_dict[self.subreddit_list_combo.currentText()].reddit_object_list
-        self.reddit_extractor = RedditExtractor(user_list, subreddit_list, self.queue, self.post_limit, self.save_path,
-                                                self.subreddit_sort_method, self.subreddit_sort_top_method,
-                                                self.restrict_date, self.restrict_by_submission_score,
+        self.reddit_extractor = RedditExtractor(user_list, subreddit_list, self.queue, self.post_limit,
+                                                self.save_path, self.subreddit_sort_method,
+                                                self.subreddit_sort_top_method, self.restrict_date,
+                                                self.restrict_by_submission_score,
                                                 self.restrict_by_submission_score_method,
                                                 self.restrict_by_submission_score_limit, None)
         self.stop_download.connect(self.reddit_extractor.stop_download)
@@ -527,8 +533,8 @@ def run_unfinished_downloads(self):
         """Downloads the content that was left during the last run if the user clicked the stop download button"""
         self.download_count = 0
         self.started_download_gui_shift()
-        self.reddit_extractor = RedditExtractor(None, None, self.queue, None, None, None, None, None, None, None, None,
-                                                self.unfinished_downloads)
+        self.reddit_extractor = RedditExtractor(None, None, self.queue, None, None, None, None, None,
+                                                None, None, None,  self.unfinished_downloads)
         self.stop_download.connect(self.reddit_extractor.stop_download)
 
         self.thread = QtCore.QThread()

DownloaderForReddit/RedditExtractor.py

@@ -27,6 +27,8 @@
 import prawcore
 from PyQt5.QtCore import QObject, pyqtSignal, QThreadPool
 
+from version import __version__
+
 
 class RedditExtractor(QObject):
 
@@ -54,7 +56,7 @@ def __init__(self, user_list, subreddit_list, queue, post_limit, save_path, subr
         The rest of teh parameters are all configuration options that are set in the settings dialog
         """
         super().__init__()
-        self._r = praw.Reddit(user_agent="python:DownloaderForReddit:V1.0 (by /u/MalloyDelacroix)",
+        self._r = praw.Reddit(user_agent='python:DownloaderForReddit:%s (by /u/MalloyDelacroix)' % __version__,
                               client_id='frGEUVAuHGL2PQ', client_secret=None)
         self.user_list = user_list
         self.subreddit_list = subreddit_list

DownloaderForReddit/main.py

@@ -23,7 +23,7 @@
 along with Downloader for Reddit.  If not, see <http://www.gnu.org/licenses/>.
 """
 
-__version__ = '1.1.0'
+from version import __version__
 
 
 import sys
@@ -35,7 +35,7 @@
 
 
 if sys.platform == 'win32':
-    myappid = 'SomeGuySoftware.DownloaderForReddit.v%s' % __version__
+    myappid = 'SomeGuySoftware.DownloaderForReddit.%s' % __version__
     AppUserModelID = ctypes.windll.shell32.SetCurrentProcessExplicitAppUserModelID(myappid)
 
 
@@ -82,7 +82,7 @@ def main():
     thread = QtCore.QThread()
     receiver = MessageReceiver(queue)
 
-    window = RedditDownloaderGUI(__version__, queue, receiver)
+    window = RedditDownloaderGUI(queue, receiver)
 
     receiver.output_signal.connect(window.update_output)
     receiver.moveToThread(thread)

DownloaderForReddit/version.py

@@ -0,0 +1 @@
+__version__ = 'v1.1.0'

setup.py

@@ -1,12 +1,14 @@
 from setuptools import setup
+from DownloaderForReddit.version import __version__
 
 setup(
     name='DownloaderForReddit',
-    version='1.0',
+    version=__version__,
     packages=[''],
-    url='',
+    url='https://github.com/MalloyDelacroix/DownloaderForReddit',
     license='GNU GPLv3',
     author='Kyle Hickey',
     author_email='kyle.hickey222@gmail.com',
-    description='A GUI application with some advanced features that downloads user posted content from reddit, either via a list of users or subreddits.'
+    description='A GUI application with some advanced features that downloads user posted content from reddit, '
+                'either via a list of users or subreddits.'
 )