2013-04-07 24 views
10

つぶやきを含む2つのテキストファイルに対してdifflibを使用してdiffを生成しようとしています。ここでは、コードは次のとおりです。ファイルを比較するpython difflib

#!/usr/bin/env python 

# difflib_test 

import difflib 

file1 = open('/home/saad/Code/test/new_tweets', 'r') 
file2 = open('/home/saad/PTITVProgs', 'r') 

diff = difflib.context_diff(file1.readlines(), file2.readlines()) 
delta = ''.join(diff) 
print delta 

ここPTITVProgsテキストファイルされる:

Watch PTI on April 6th (7) Dr Israr Shah at 10PM on Business Plus in "Talking Policy". Rgds #PTI 
CORRECTION!! Watch PTI on April 6th (5) @Asad_Umar at 8PM on ARY News. Rgds #PTI 
Watch PTI on April 6th (5) @Asad_Umar at 8PM on AAJ News (6) PTI vs PMLN at 8PM on NewsOne. Rgds #PTI 
Watch PTI on April 6th (5) Asad Umar at 8PM on AAJ News (6) PTI vs PMLN at 8PM on NewsOne. Rgds #PTI 
Watch PTI on April 6th (5) Waleed Iqbal at 8PM on Channel 5. Rgds #PTI 
Watch PTI on April 6th (3) Dr Israr Shah at 10PM on PTV News. Rgds #PTI 
Watch PTI on April 6th (4) Javed hashmi at 1PM on PTV News. Rgds #PTI 
Watch PTI on April 6th (3) Imran Alvi at 1PM on AAJ News. Rgds #PTI 
Watch PTI on April 6th (1) Dr @ArifAlvi, Andleeb Abbas and Ehtisham Ameer at 11PM on ARY News (2) Hamid Khan at 10PM on ATV. Rgds #PTI 
Watch PTI on April 5th (1) Farooq Amjad Meer at 10:45PM on Dunya News. Rgds #PTI 
Watch PTI on April 4th (4) Faisal Khan at 8PM on PTV News. Rgds #PTI 
@FaisalJavedKhan 
Watch PTI on April 4th (3) Faisal Khan at 11PM on ATV. Rgds #PTI 
@FaisalJavedKhan 
Watch PTI on April 4th (1) Dr Israr Shah at 8PM on Waqt News (2) Dr Arif Alvi at 9PM on PTV World. Rgds #PTI 
@ArifAlvi 
Watch PTI on April 3rd (12) Abrar ul Haq on 10PM on Dawn News (13) Shabbir Sial at 10PM on Channel5. Rgds #PTI 
Watch PTI on April 3rd (11) Sadaqat Abbasi on 8PM on RohiTV. Rgds #PTI 
Watch PTI on April 3rd (10) Dr Zarqa and Andleeb Abbas on 8PM on Waqt News. Rgds #PTI 
Watch PTI on April 3rd (9) Fauzia Kasuri at 8PM on Din News. Rgds #PTI 
Watch PTI on April 3rd (8) Mehmood Rasheed at 8PM on ARY News. Rgds #PTI 
Watch PTI on April 3rd (7) Israr Abbasi (Repeat on Arp 4th) at 1:20AM and 1PM on Vibe TV. Rgds #PTI 
Watch PTI on April 3rd (5) Rao Fahad at 9PM on Express News (6) Dr Seems Zia at 10:30PM on Health TV. Rgds #PTI 

はここnew_tweetsテキストファイルされる:

Watch PTI on April 7th (3) Malaika Reza at 8PM on AAJ News (4) Shah Mehmood Qureshi at 8PM on Geo News. Rgds #PTI 
Watch PTI on April 7th (2) Chairman IMRAN KHAN at 10PM on PTV News in News Night with Sadia Afzal, Rpt: 2AM, 2PM. Rgds #PTI 
@ImranKhanPTI 
Watch PTI on April 7th (1) Dr Waseem Shahzad NOW at 6PM on PTV News. Rgds #PTI 
Watch PTI on April 6th (7) Dr Israr Shah at 10PM on Business Plus in "Talking Policy". Rgds #PTI 
CORRECTION!! Watch PTI on April 6th (5) @Asad_Umar at 8PM on ARY News. Rgds #PTI 
Watch PTI on April 6th (5) @Asad_Umar at 8PM on AAJ News (6) PTI vs PMLN at 8PM on NewsOne. Rgds #PTI 
Watch PTI on April 6th (5) Asad Umar at 8PM on AAJ News (6) PTI vs PMLN at 8PM on NewsOne. Rgds #PTI 
Watch PTI on April 6th (5) Waleed Iqbal at 8PM on Channel 5. Rgds #PTI 
Watch PTI on April 6th (3) Dr Israr Shah at 10PM on PTV News. Rgds #PTI 
Watch PTI on April 6th (4) Javed hashmi at 1PM on PTV News. Rgds #PTI 
Watch PTI on April 6th (3) Imran Alvi at 1PM on AAJ News. Rgds #PTI 
Watch PTI on April 6th (1) Dr @ArifAlvi, Andleeb Abbas and Ehtisham Ameer at 11PM on ARY News (2) Hamid Khan at 10PM on ATV. Rgds #PTI 
Watch PTI on April 5th (1) Farooq Amjad Meer at 10:45PM on Dunya News. Rgds #PTI 
Watch PTI on April 4th (4) Faisal Khan at 8PM on PTV News. Rgds #PTI 
@FaisalJavedKhan 
Watch PTI on April 4th (3) Faisal Khan at 11PM on ATV. Rgds #PTI 
@FaisalJavedKhan 
Watch PTI on April 4th (1) Dr Israr Shah at 8PM on Waqt News (2) Dr Arif Alvi at 9PM on PTV World. Rgds #PTI 
@ArifAlvi 
Watch PTI on April 3rd (12) Abrar ul Haq on 10PM on Dawn News (13) Shabbir Sial at 10PM on Channel5. Rgds #PTI 
Watch PTI on April 3rd (11) Sadaqat Abbasi on 8PM on RohiTV. Rgds #PTI 
Watch PTI on April 3rd (10) Dr Zarqa and Andleeb Abbas on 8PM on Waqt News. Rgds #PTI 
Watch PTI on April 3rd (9) Fauzia Kasuri at 8PM on Din News. Rgds #PTI 

ここでは、私はプログラムから取得する差分です。

*** 
--- 
*************** 
*** 1,7 **** 
- Watch PTI on April 7th (3) Malaika Reza at 8PM on AAJ News (4) Shah Mehmood Qureshi at 8PM on Geo News. Rgds #PTI 
- Watch PTI on April 7th (2) Chairman IMRAN KHAN at 10PM on PTV News in News Night with Sadia Afzal, Rpt: 2AM, 2PM. Rgds #PTI 
- @ImranKhanPTI 
- Watch PTI on April 7th (1) Dr Waseem Shahzad NOW at 6PM on PTV News. Rgds #PTI 
    Watch PTI on April 6th (7) Dr Israr Shah at 10PM on Business Plus in "Talking Policy". Rgds #PTI 
    CORRECTION!! Watch PTI on April 6th (5) @Asad_Umar at 8PM on ARY News. Rgds #PTI 
    Watch PTI on April 6th (5) @Asad_Umar at 8PM on AAJ News (6) PTI vs PMLN at 8PM on NewsOne. Rgds #PTI 
--- 1,3 ---- 
*************** 
*** 21,24 **** 
    Watch PTI on April 3rd (12) Abrar ul Haq on 10PM on Dawn News (13) Shabbir Sial at 10PM on Channel5. Rgds #PTI 
    Watch PTI on April 3rd (11) Sadaqat Abbasi on 8PM on RohiTV. Rgds #PTI 
    Watch PTI on April 3rd (10) Dr Zarqa and Andleeb Abbas on 8PM on Waqt News. Rgds #PTI 
! Watch PTI on April 3rd (9) Fauzia Kasuri at 8PM on Din News. Rgds #PTI--- 17,23 ---- 
    Watch PTI on April 3rd (12) Abrar ul Haq on 10PM on Dawn News (13) Shabbir Sial at 10PM on Channel5. Rgds #PTI 
    Watch PTI on April 3rd (11) Sadaqat Abbasi on 8PM on RohiTV. Rgds #PTI 
    Watch PTI on April 3rd (10) Dr Zarqa and Andleeb Abbas on 8PM on Waqt News. Rgds #PTI 
! Watch PTI on April 3rd (9) Fauzia Kasuri at 8PM on Din News. Rgds #PTI 
! Watch PTI on April 3rd (8) Mehmood Rasheed at 8PM on ARY News. Rgds #PTI 
! Watch PTI on April 3rd (7) Israr Abbasi (Repeat on Arp 4th) at 1:20AM and 1PM on Vibe TV. Rgds #PTI 
! Watch PTI on April 3rd (5) Rao Fahad at 9PM on Express News (6) Dr Seems Zia at 10:30PM on Health TV. Rgds #PTI 

2つのソースファイル(PTITVProgsとnew_tweets)を素早く比較してみると、の4つのつぶやきがであり、4月3日のつぶやきがの3つです。

new_tweetsの行は、PTITVProgsには含まれていません。

しかし、それは私が見たくないテキストの束を投げます。 diff出力の*** 1,7****** 1,3***が何のために立っているのかわかりません...? 変更された行だけを取得する適切な方法は何ですか?

+1

を私はよく分からないdifflibは、あなたがしようとしている仕事のための適切なツールです。まったく同じです。セット比較をするよりdiffを生成するのはもっと多くの作業(アルゴリズム的に言えば)です。 'print set(fileA.readlines())。difference(set(fileB.readlines()))' –

答えて

20

ただ、このような差分の出力解析(変更を「 - 」「+」に必要な場合):

#!/usr/bin/env python 

# difflib_test 

import difflib 

file1 = open('/home/saad/Code/test/new_tweets', 'r') 
file2 = open('/home/saad/PTITVProgs', 'r') 

diff = difflib.ndiff(file1.readlines(), file2.readlines()) 
delta = ''.join(x[2:] for x in diff if x.startswith('- ')) 
print delta 
14

difflibライブラリに複数のdiffスタイルと異なる機能があります。 unified_diff,ndiffおよびcontext_diffである。

あなたは行番号の要約をしたくない場合は、ndiff機能は、異なるスタイルをデルタ与える:

import difflib 

f1 = '''1 
2 
3 
4 
5''' 
f2 = '''1 
3 
4 
5 
6''' 

diff = difflib.ndiff(f1,f2) 

for l in diff: 
    print(l) 

を出力:

1 
- 2   
    3   
    4   
    5 
+ 6 

EDIT:

あなた可能性あなたが望むのであれば、diffを解析して変更だけを抽出します:

>>>changes = [l for l in diff if l.startswith('+ ') or l.startswith('- ')] 

>>>for c in changes: 
     print(c) 
>>> 
- 2 
+ 6 
+1

私が質問を読んだところ、OPはコンテキスト行を望んでいませんでした。上記の@ gattoの答えは、OPが望む形式にマッチする良い仕事をします。 –