Thme 456

.gitignore

@@ -1,2 +1,3 @@
 *.nzb
 *.pyc
+*~

README.rst

@@ -1,21 +1,20 @@
-==================
-**IMPORTANT NOTE**
-==================
-This project is no longer being actively maintained. It still works fine but no
-new features will ever be appearing. Check out `my GoPostStuff project <https://github.com/madcowfred/GoPostStuff/>`_
-for a new and much scarier version of the idea.
-
-
-
 newsmangler
 ===========
 
 newsmangler is a basic client for posting binaries to Usenet. The only notable
 feature is multiple connection support to efficiently utilize modern bandwidth.
+It supports SSL connection !
+
+Requirements
+============
+
+Python 2.6 or newer (including Python 3).
+For SSL connection you will need OpenSSL:
+``pip install python-openssl`` or ``sudo aptitude install python-openssl`` (debian/ubuntu)
 
 Installation
 ============
-#. Download the source: ``git clone git://github.com/madcowfred/newsmangler.git``
+#. Download the source: ``git clone git://github.com/nicors57/newsmangler.git``
    (or download a .zip I guess).
 
 #. Copy sample.conf to ~/.newsmangler.conf, edit the options as appropriate.
@@ -43,3 +42,8 @@ The files will post as:
   ``test post please ignore [3/3] - "test.part2.rar" yEnc (01/27)``
 
 See ``python mangler.py --help`` for other options.
+
+Notes
+=====
+
+Upload using Python3 is slower (~20%) than using python2.

mangler.py

@@ -31,118 +31,126 @@
 
 import os
 import sys
-from ConfigParser import ConfigParser
+
 from optparse import OptionParser
 
 from newsmangler.common import ParseConfig
 from newsmangler.postmangler import PostMangler
 
 # ---------------------------------------------------------------------------
 
-def main():
-	# Parse our command line options
-	parser = OptionParser(usage='usage: %prog [options] dir1 dir2 ... dirN')
-	parser.add_option('-c', '--config',
-		dest='config',
-		help='Specify a different config file location',
-	)
-	parser.add_option('-f', '--files',
-		dest='files',
-		help='Assume all arguments are filenames instead of directories, and use SUBJECT as the base subject',
-		metavar='SUBJECT',
-	)
-	parser.add_option('-g', '--group',
-		dest='group',
-		help='Post to a different group than the default',
-	)
-	# parser.add_option('-p', '--par2',
-	# 	dest='generate_par2',
-	# 	action='store_true',
-	# 	default=False,
-	# 	help="Generate PAR2 files in the background if they don't exist already.",
-	# )
-	parser.add_option('-d', '--debug',
-		dest='debug',
-		action='store_true',
-		default=False,
-		help="Enable debug logging",
-	)
-	parser.add_option('--profile',
-		dest='profile',
-		action='store_true',
-		default=False,
-		help='Run with the hotshot profiler (measures execution time of functions)',
-	)
+def parseCmdLineOption():
+    # Parse our command line options
+    parser = OptionParser(usage='usage: %prog [options] dir1 dir2 ... dirN')
+    parser.add_option('-c', '--config',
+        dest='config',
+        help='Specify a different config file location',
+    )
+    parser.add_option('-f', '--files',
+        dest='files',
+        help='Assume all arguments are filenames instead of directories, \
+            and use SUBJECT as the base subject',
+        metavar='SUBJECT',
+    )
+    parser.add_option('-g', '--group',
+        dest='group',
+        help='Post to a different group than the default',
+    )
+    # parser.add_option('-p', '--par2',
+    #     dest='generate_par2',
+    #     action='store_true',
+    #     default=False,
+    #     help="Generate PAR2 files in the background if they don't exist already.",
+    # )
+    parser.add_option('-d', '--debug',
+        dest='debug',
+        action='store_true',
+        default=False,
+        help="Enable debug logging",
+    )
+    parser.add_option('--profile',
+        dest='profile',
+        action='store_true',
+        default=False,
+        help='Run with the hotshot profiler (measures execution time of functions)',
+    )
 
-	(options, args) = parser.parse_args()
-
-	# No args? We have nothing to do!
-	if not args:
-		parser.print_help()
-		sys.exit(1)
-
-	# Make sure at least one of the args exists
-	postme = []
-	post_title = None
-	if options.files:
-		post_title = options.files
-		for arg in args:
-			if os.path.isfile(arg):
-				postme.append(arg)
-			else:
-				print 'ERROR: "%s" does not exist or is not a file!' % (arg)
-	else:
-		for arg in args:
-			if os.path.isdir(arg):
-				postme.append(arg)
-			else:
-				print 'ERROR: "%s" does not exist or is not a file!' % (arg)
-
-	if not postme:
-		print 'ERROR: no valid arguments provided on command line!'
-		sys.exit(1)
-
-	# Parse our configuration file
-	if options.config:
-		conf = ParseConfig(options.config)
-	else:
-		conf = ParseConfig()
-
-	# Make sure the group is ok
-	if options.group:
-		if '.' not in options.group:
-			newsgroup = conf['aliases'].get(options.group)
-			if not newsgroup:
-				print 'ERROR: group alias "%s" does not exist!' % (options.group)
-				sys.exit(1)
-		else:
-			newsgroup = options.group
-	else:
-		newsgroup = conf['posting']['default_group']
-
-	# Strip whitespace from the newsgroup list to obey RFC1036
-	for c in (' \t'):
-		newsgroup = newsgroup.replace(c, '')
-
-	# And off we go
-	poster = PostMangler(conf, options.debug)
-
-	if options.profile:
-		import hotshot
-		prof = hotshot.Profile('profile.poster')
-		prof.runcall(poster.post, newsgroup, postme, post_title=post_title)
-		prof.close()
-
-		import hotshot.stats
-		stats = hotshot.stats.load('profile.poster')
-		stats.strip_dirs()
-		stats.sort_stats('time', 'calls')
-		stats.print_stats(25)
-
-	else:
-		poster.post(newsgroup, postme, post_title=post_title)
+    (options, args) = parser.parse_args()
+
+    # No args? We have nothing to do!
+    if not args:
+        parser.print_help()
+        sys.exit(1)
+
+    return (options, args)
+
+
+def main():
+    (options, args) = parseCmdLineOption()
+
+    # Make sure at least one of the args exists
+    postme = []
+    post_title = None
+    if options.files:
+        post_title = options.files
+        for arg in args:
+            if os.path.isfile(arg):
+                postme.append(arg)
+            else:
+                print('ERROR: "%s" does not exist or is not a file!' % (arg))
+    else:
+        for arg in args:
+            if os.path.isdir(arg):
+                postme.append(arg)
+            else:
+                print('ERROR: "%s" does not exist or is not a file!' % (arg))
+
+    if not postme:
+        print('ERROR: no valid arguments provided on command line!')
+        sys.exit(1)
+
+    # Parse our configuration file
+    if options.config:
+        conf = ParseConfig(options.config)
+    else:
+        conf = ParseConfig()
+
+    # Make sure the group is ok
+    if options.group:
+        if '.' not in options.group:
+            newsgroup = conf['aliases'].get(options.group)
+            if not newsgroup:
+                print('ERROR: group alias "%s" does not exist!' % (options.group))
+                sys.exit(1)
+        else:
+            newsgroup = options.group
+    else:
+        newsgroup = conf['posting']['default_group']
+
+    # Strip whitespace from the newsgroup list to obey RFC1036
+    for c in (' \t'):
+        newsgroup = newsgroup.replace(c, '')
+
+    # And off we go
+    poster = PostMangler(conf, options.debug)
+
+    if options.profile:
+        # TODO: replace by cProfile (PY3 compatibility)
+        import hotshot
+        prof = hotshot.Profile('profile.poster')
+        prof.runcall(poster.post, newsgroup, postme, post_title=post_title)
+        prof.close()
+
+        import hotshot.stats
+        stats = hotshot.stats.load('profile.poster')
+        stats.strip_dirs()
+        stats.sort_stats('time', 'calls')
+        stats.print_stats(25)
+
+    else:
+        poster.post(newsgroup, postme, post_title=post_title)
 
 # ---------------------------------------------------------------------------
 
 if __name__ == '__main__':
-	main()
+    main()