Rearranged functions

3 files changed, 45 insertions, 43 deletions

diff --git a/config.py b/config.py
index bd8ef1b..4854e0d 100644
--- a/config.py
+++ b/config.py
@@ -40,6 +40,11 @@ whitelist = docs + "/whitelist.txt"
 pending   = docs + "/pending"
 rsync_blacklist = docs + "/rsyncBlacklist"
 
+# Rsync commands
+
+rsync_list_command="rsync -a --no-motd --list-only "
+
+
 # Classes and Exceptions
 class NonValidFile(ValueError): pass
 class NonValidDir(ValueError): pass
diff --git a/filter.py b/filter.py
index ffc0965..b51dba8 100644
--- a/filter.py
+++ b/filter.py
@@ -6,49 +6,6 @@ import re
 from repm.config import *
 from repm.pato2 import *
 
-rsync_list_command="rsync -a --no-motd --list-only "
-
-def generate_rsync_command(base_command, dir_list, destdir=repodir, mirror_name=mirror,
-                           mirror_path=mirrorpath, blacklist_file=False):
-    """ Generates an rsync command for executing it by combining all parameters.
-    
-    Parameters:
-    ----------
-    base_command   -> str
-    mirror_name    -> str
-    mirror_path    -> str
-    dir_list       -> list or tuple
-    destdir        -> str                  Path to dir, dir must exist.
-    blacklist_file -> False or str         Path to file, file must exist.
-    
-    Return:
-    ----------
-    rsync_command -> str """
-    from os.path import isfile, isdir
-
-    if blacklist_file and not isfile(blacklist_file):
-        print(blacklist_file + " is not a file")
-        raise NonValidFile
-
-    if not os.path.isdir(destdir):
-        print(destdir + " is not a directory")
-        raise NonValidDir
-
-    dir_list="{" + ",".join(dir_list) + "}"
-
-    if blacklist_file:
-        return " ".join((base_command, "--exclude-from-file="+blacklist_file,
-                        mirror_name + mirror_path + dir_list, destdir))
-    return " ".join((base_command, mirror_name + mirror_path + dir_list, destdir))
-
-def run_rsync(base_for_rsync=rsync_list_command, dir_list_for_rsync=(repo_list + dir_list),
-              debug=verbose):
-    """ Runs rsync and gets returns it's output """
-    cmd = str(generate_rsync_command(rsync_list_command, (repo_list + dir_list)))
-    if debug:
-        printf("rsync_command" + cmd)
-    return commands.getoutput(cmd)
-
 def get_file_list_from_rsync_output(rsync_output):
     """ Generates a list of packages and versions from an rsync output using --list-only --no-motd.
 
diff --git a/pato2.py b/pato2.py
index cfdd859..125ae8c 100644
--- a/pato2.py
+++ b/pato2.py
@@ -166,6 +166,46 @@ def get_licenses(verbose_=verbose):
 	a=commands.getoutput(cmd_)
 	if verbose_: printf(a)
 
+def generate_rsync_command(base_command, dir_list, destdir=repodir,
+                           source=mirror+mirrorpath, blacklist_file=False):
+    """ Generates an rsync command for executing it by combining all parameters.
+    
+    Parameters:
+    ----------
+    base_command   -> str
+    dir_list       -> list or tuple
+    destdir        -> str                  Path to dir, dir must exist.
+    source         -> str                  The source for rsync
+    blacklist_file -> False or str         Path to file, file must exist.
+    
+    Return:
+    ----------
+    rsync_command -> str """
+    from os.path import isfile, isdir
+
+    if blacklist_file and not isfile(blacklist_file):
+        print(blacklist_file + " is not a file")
+        raise NonValidFile
+
+    if not os.path.isdir(destdir):
+        print(destdir + " is not a directory")
+        raise NonValidDir
+
+    dir_list="{" + ",".join(dir_list) + "}"
+
+    if blacklist_file:
+        return " ".join((base_command, "--exclude-from-file="+blacklist_file,
+                        mirror_name + mirror_path + dir_list, destdir))
+    return " ".join((base_command, mirror_name + mirror_path + dir_list, destdir))
+
+def run_rsync(base_for_rsync=rsync_list_command, dir_list_for_rsync=(repo_list + dir_list),
+              debug=verbose):
+    """ Runs rsync and gets returns it's output """
+    cmd = str(generate_rsync_command(rsync_list_command, (repo_list + dir_list)))
+    if debug:
+        printf("rsync_command" + cmd)
+    return commands.getoutput(cmd)
+
 if __name__ == "__main__":
 	from time import time
 	start_time = time()