martyr-deepin / deepin-movie

Old deepin media player, see deepin-movie-reborn for the new one.
https://github.com/linuxdeepin/deepin-movie-reborn
GNU General Public License v3.0
146 stars 65 forks source link

python-magic API is broken #5

Open xiangzhai opened 10 years ago

xiangzhai commented 10 years ago

https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=702135

diff --git a/utils.py b/utils.py
index a68f256..5b14def 100644
--- a/utils.py
+++ b/utils.py
@@ -26,8 +26,7 @@ import subprocess
 from ConfigParser import ConfigParser

 import magic
-md = magic.open(magic.MAGIC_MIME_TYPE)
-md.load()
+md = magic.Magic(mime=True)
 from PyQt5.QtWidgets import QApplication
 from PyQt5.QtGui import QKeySequence
 from PyQt5.QtCore import QObject, QThread, pyqtSignal, pyqtSlot, pyqtProperty
@@ -95,13 +94,13 @@ def sortSeries(serieName, series):
 def getFileMimeType(filename):
     result = None
     try:
-        result = md.file(filename)
+        result = md.from_file(filename)
     except Exception:
         try:
-           result = md.file(filename.encode("utf-8"))
+           result = md.from_file(filename.encode("utf-8"))
         except Exception:
             try:
-                result = md.file(filename.encode("gbk"))
+                result = md.from_file(filename.encode("gbk"))
             except Exception:
                 pass
     return result