put TextProcess and myurlgrab from fs_related to rpmmisc

TextProcess and myurlgrab is related with backend, irrelated with fs_related

Signed-off-by: Gui Chen <gui.chen@intel.com>

diff --git a/mic/utils/fs_related.py b/mic/utils/fs_related.py
index 929d8d2..6e80ce3 100644 (file)
--- a/mic/utils/fs_related.py
+++ b/mic/utils/fs_related.py
@@ -23,58 +23,11 @@ import stat
 import random
 import string
 import time
-import fcntl
-import struct
-import termios
 
 from errors import *
 from mic import msger
 import runner
 
-def terminal_width(fd=1):
-    """ Get the real terminal width """
-    try:
-        buf = 'abcdefgh'
-        buf = fcntl.ioctl(fd, termios.TIOCGWINSZ, buf)
-        return struct.unpack('hhhh', buf)[1]
-    except: # IOError
-        return 80
-
-def truncate_url(url, width):
-    return os.path.basename(url)[0:width]
-
-class TextProgress(object):
-    # make the class as singleton
-    _instance = None
-    def __new__(cls, *args, **kwargs):
-        if not cls._instance:
-            cls._instance = super(TextProgress, cls).__new__(cls, *args, **kwargs)
-
-        return cls._instance
-
-    def __init__(self, totalnum = None):
-        self.total = totalnum
-        self.counter = 1
-
-    def start(self, filename, url, *args, **kwargs):
-        self.url = url
-        self.termwidth = terminal_width()
-        msger.info("\r%-*s" % (self.termwidth, " "))
-        if self.total is None:
-            msger.info("\rRetrieving %s ..." % truncate_url(self.url, self.termwidth - 15))
-        else:
-            msger.info("\rRetrieving %s [%d/%d] ..." % (truncate_url(self.url, self.termwidth - 25), self.counter, self.total))
-
-    def update(self, *args):
-        pass
-
-    def end(self, *args):
-        if self.counter == self.total:
-            msger.raw("\n")
-
-        if self.total is not None:
-            self.counter += 1
-
 def find_binary_path(binary):
     if os.environ.has_key("PATH"):
         paths = os.environ["PATH"].split(":")
@@ -856,28 +809,6 @@ def load_module(module):
         msger.info("Loading %s..." % module)
         runner.quiet(['modprobe', module])
 
-def myurlgrab(url, filename, proxies, progress_obj = None):
-    from pykickstart.urlgrabber.grabber import URLGrabber, URLGrabError
-
-    g = URLGrabber()
-    if progress_obj is None:
-        progress_obj = TextProgress()
-
-    if url.startswith("file:/"):
-        file = url.replace("file:", "")
-        if not os.path.exists(file):
-            raise CreatorError("URLGrabber error: can't find file %s" % file)
-        runner.show(['cp', "-f", file, filename])
-    else:
-        try:
-            filename = g.urlgrab(url = url, filename = filename,
-                ssl_verify_host = False, ssl_verify_peer = False,
-                proxies = proxies, http_headers = (('Pragma', 'no-cache'),), progress_obj = progress_obj)
-        except URLGrabError, e:
-            raise CreatorError("URLGrabber error: %s" % url)
-
-    return filename
-
 def get_loop_device(losetupcmd, lofile):
     """ Get a lock to synchronize getting a loopback device """
 

diff --git a/mic/utils/misc.py b/mic/utils/misc.py
index 4b40db6..e6cd294 100644 (file)
--- a/mic/utils/misc.py
+++ b/mic/utils/misc.py
@@ -38,6 +38,7 @@ xmlparse = cElementTree.parse
 
 from errors import *
 from fs_related import *
+from rpmmisc import myurlgrab
 from proxy import get_proxy_for
 import runner
 

diff --git a/mic/utils/rpmmisc.py b/mic/utils/rpmmisc.py
index 8625983..759e5d7 100644 (file)
--- a/mic/utils/rpmmisc.py
+++ b/mic/utils/rpmmisc.py
@@ -16,10 +16,79 @@
 # Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 import os, sys, re
+import fcntl
+import struct
+import termios
 import rpm
 from mic import msger
 import runner
 
+def myurlgrab(url, filename, proxies, progress_obj = None):
+    from pykickstart.urlgrabber.grabber import URLGrabber, URLGrabError
+
+    g = URLGrabber()
+    if progress_obj is None:
+        progress_obj = TextProgress()
+
+    if url.startswith("file:/"):
+        file = url.replace("file:", "")
+        if not os.path.exists(file):
+            raise CreatorError("URLGrabber error: can't find file %s" % file)
+        runner.show(['cp', "-f", file, filename])
+    else:
+        try:
+            filename = g.urlgrab(url = url, filename = filename,
+                ssl_verify_host = False, ssl_verify_peer = False,
+                proxies = proxies, http_headers = (('Pragma', 'no-cache'),), progress_obj = progress_obj)
+        except URLGrabError, e:
+            raise CreatorError("URLGrabber error: %s" % url)
+
+    return filename
+
+def terminal_width(fd=1):
+    """ Get the real terminal width """
+    try:
+        buf = 'abcdefgh'
+        buf = fcntl.ioctl(fd, termios.TIOCGWINSZ, buf)
+        return struct.unpack('hhhh', buf)[1]
+    except: # IOError
+        return 80
+
+def truncate_url(url, width):
+    return os.path.basename(url)[0:width]
+
+class TextProgress(object):
+    # make the class as singleton
+    _instance = None
+    def __new__(cls, *args, **kwargs):
+        if not cls._instance:
+            cls._instance = super(TextProgress, cls).__new__(cls, *args, **kwargs)
+
+        return cls._instance
+
+    def __init__(self, totalnum = None):
+        self.total = totalnum
+        self.counter = 1
+
+    def start(self, filename, url, *args, **kwargs):
+        self.url = url
+        self.termwidth = terminal_width()
+        msger.info("\r%-*s" % (self.termwidth, " "))
+        if self.total is None:
+            msger.info("\rRetrieving %s ..." % truncate_url(self.url, self.termwidth - 15))
+        else:
+            msger.info("\rRetrieving %s [%d/%d] ..." % (truncate_url(self.url, self.termwidth - 25), self.counter, self.total))
+
+    def update(self, *args):
+        pass
+
+    def end(self, *args):
+        if self.counter == self.total:
+            msger.raw("\n")
+
+        if self.total is not None:
+            self.counter += 1
+
 class RPMInstallCallback:
     """ Command line callback class for callbacks from the RPM library.
     """

diff --git a/plugins/backend/yumpkgmgr.py b/plugins/backend/yumpkgmgr.py
index 7e59571..1563628 100644 (file)
--- a/plugins/backend/yumpkgmgr.py
+++ b/plugins/backend/yumpkgmgr.py
@@ -23,7 +23,7 @@ import yum
 
 from mic import msger
 from mic.kickstart import ksparser
-from mic.utils import rpmmisc, fs_related as fs
+from mic.utils import rpmmisc
 from mic.utils.errors import CreatorError
 from mic.imager.baseimager import BaseImageCreator
 
@@ -283,7 +283,7 @@ class Yum(BackendPlugin, yum.YumBase):
         try:
             repos = self.repos.listEnabled()
             for repo in repos:
-                repo.setCallback(fs.TextProgress(total_count - cached_count))
+                repo.setCallback(rpmmisc.TextProgress(total_count - cached_count))
             self.downloadPkgs(dlpkgs)
             # FIXME: sigcheck?
 

diff --git a/plugins/backend/zypppkgmgr.py b/plugins/backend/zypppkgmgr.py
index 49a64ea..82d33c9 100644 (file)
--- a/plugins/backend/zypppkgmgr.py
+++ b/plugins/backend/zypppkgmgr.py
@@ -28,7 +28,7 @@ if not hasattr(zypp, 'PoolQuery') or not hasattr(zypp.RepoManager, 'loadSolvFile
 
 from mic import msger
 from mic.kickstart import ksparser
-from mic.utils import rpmmisc, fs_related as fs
+from mic.utils import rpmmisc
 from mic.utils.proxy import get_proxy_for
 from mic.utils.errors import CreatorError
 from mic.imager.baseimager import BaseImageCreator
@@ -477,7 +477,7 @@ class Zypp(BackendPlugin):
 
     def downloadPkgs(self, package_objects, count):
         localpkgs = self.localpkgs.keys()
-        progress_obj = fs.TextProgress(count)
+        progress_obj = rpmmisc.TextProgress(count)
         for po in package_objects:
             if po.name() in localpkgs:
                 continue
@@ -503,7 +503,7 @@ class Zypp(BackendPlugin):
                 location = location[2:]
             url = baseurl + "/%s" % location
             try:
-                filename = fs.myurlgrab(url, filename, proxies, progress_obj)
+                filename = rpmmisc.myurlgrab(url, filename, proxies, progress_obj)
             except CreatorError:
                 self.close()
                 raise